选入药品逻辑优化

src/main/java/com/glxp/api/controller/alihealth/AlihealthBusController.java

@@ -168,6 +168,10 @@ public class AlihealthBusController extends BaseController {
         if (com.glxp.api.util.StringUtils.isNotEmpty(alihealthThirdAliDrugInsertReqeust.getBzgg())) {
             map.put("bzgg", alihealthThirdAliDrugInsertReqeust.getBzgg());
 
+        }
+        if (com.glxp.api.util.StringUtils.isNotEmpty(alihealthThirdAliDrugInsertReqeust.getNameCode())) {
+            map.put("nameCode", alihealthThirdAliDrugInsertReqeust.getNameCode());
+
         }
         map.put("page", alihealthThirdAliDrugInsertReqeust.getPage());
         map.put("limit", alihealthThirdAliDrugInsertReqeust.getLimit());

src/main/java/com/glxp/api/controller/basic/UdiContrastController.java

@@ -130,7 +130,7 @@ public class UdiContrastController extends BaseController{
                     basicProductsCreateDto.setMainId(thirdId);
                     basicProductsCreateDto.setDrugCheckMark(false);
 
-                    udiContrastService.createOnlyMainId(basicProductsCreateDto);
+                    return udiContrastService.createOnlyMainId(basicProductsCreateDto);
                 }
             }
             if (StrUtil.isNotBlank(buffer.toString())) {

src/main/java/com/glxp/api/controller/thrsys/ThirdAliDrugController.java

@@ -112,6 +112,8 @@ public class ThirdAliDrugController extends BaseController {
         alihealthThirdAliDrugInsertReqeust.setPage(thirdAliDrug.getPage());
         alihealthThirdAliDrugInsertReqeust.setLimit(thirdAliDrug.getLimit());
         alihealthThirdAliDrugInsertReqeust.setDrugCheckMark(true);
+        alihealthThirdAliDrugInsertReqeust.setNameCode(thirdAliDrug.getNameCode());
+
         AlihealthKytDrugrescodeReqeust alihealthKytDrugrescodeReqeust = new AlihealthKytDrugrescodeReqeust();
         alihealthKytDrugrescodeReqeust.setPhysic_name(thirdAliDrug.getCpmctymc());
         alihealthKytDrugrescodeReqeust.setApproval_licence_no(thirdAliDrug.getApprovalNum());

src/main/java/com/glxp/api/req/alihealth/local/AlihealthThirdAliDrugInsertReqeust.java

@@ -22,6 +22,7 @@ public class AlihealthThirdAliDrugInsertReqeust extends ListPageRequest {
      * 药品校验标识
      */
     private boolean drugCheckMark;
+    private String nameCode;
 
     private AlihealthKytDrugrescodeReqeust alihealthKytDrugrescodeReqeust;
 }

src/main/java/com/glxp/api/service/basic/UdiContrastService.java

@@ -241,7 +241,7 @@ public class UdiContrastService {
     private AlihealthBusController alihealthBusController;
 
     //    @Transactional
-    public void createOnlyMainId(BasicProductsCreateDto basicProductsCreateDto) {
+    public BaseResponse createOnlyMainId(BasicProductsCreateDto basicProductsCreateDto) {
         String mainId = basicProductsCreateDto.getMainId();
         FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest();
         filterThrProductsRequest.setCode(mainId);
@@ -326,10 +326,11 @@ public class UdiContrastService {
 //                    udiProductEntity.setSptm(ybDrug.getBusinessLicense());
                     udiProductEntity.setPrepnUnit(ybDrug.getRealityMedicinemodel());
                 } else {
-                    udiProductEntity.setCpmctymc(thrProductsEntity.getName());
+                    return ResultVOUtils.error(500,"未能查询到此医保编码");
+//                    udiProductEntity.setCpmctymc(thrProductsEntity.getName());
                 }
                 if (StrUtil.isEmpty(udiProductEntity.getZczbhhzbapzbh()) || StrUtil.isEmpty(udiProductEntity.getCpmctymc())) {
-                    return;
+                    return ResultVOUtils.success();
                 }
                 // 本地查询先注释了
                 List<ThirdAliDrug> thirdAliDrugList = new ArrayList<>();
@@ -563,7 +564,7 @@ public class UdiContrastService {
             if (!aBoolean) {
                 throw new JsonException(500, "系统繁忙,");
             }
-            return;
+            return ResultVOUtils.success();
 //            UdiProductEntity udiProductEntity = new UdiProductEntity();
 //            BeanUtils.copyProperties(thrProductsEntity, udiProductEntity);
 //            if (thrProductsEntity.getProductType() != 2){
@@ -603,6 +604,7 @@ public class UdiContrastService {
 //            udiRelevanceEntity = udiRelevanceService.insertDefaultLevel(udiRelevanceEntity, udiProductEntity);
 //            udiRelevanceService.insertUdiRelevance(udiRelevanceEntity);
         }
+        return ResultVOUtils.success();
 
     }