Forráskód Böngészése

Merge branch 'dev/mix20191205_push' into dev/prec20191219_quote

gaodm 5 éve
szülő
commit
b9d077e7f2

+ 22 - 17
aipt-service/src/main/java/com/diagbot/facade/TransferFacade.java

@@ -86,7 +86,7 @@ public class TransferFacade {
      */
     public List<Lis> addLisUniqueName(List<Lis> lis, String hosCode) {
         if (ListUtil.isEmpty(lis)) {
-            return null;
+            return Lists.newLinkedList();
         }
         List<Lis> retLis = Lists.newLinkedList();
         //化验项转公表内容,参数处理
@@ -140,9 +140,8 @@ public class TransferFacade {
      */
     public List<Pacs> addPacsUniqueName(List<Pacs> pacs, String hosCode) {
         if (ListUtil.isEmpty(pacs)) {
-            return null;
+            return Lists.newLinkedList();
         }
-        Map<String, Pacs> pacsOriginalMap = EntityUtil.makeEntityMap(pacs, "name");
         List<Pacs> convertPacs = Lists.newLinkedList();
         PacsConfigVO pacsConfigVO = new PacsConfigVO();
         pacsConfigVO.setHosCode(hosCode);
@@ -154,16 +153,21 @@ public class TransferFacade {
         RespDTO<Map<String, List<String>>> pacsRespDTO = tranServiceClient.getPacsConfig(pacsConfigVO);
         if (RespDTOUtil.respIsOK(pacsRespDTO)) {
             Map<String, List<String>> pacsMap = pacsRespDTO.data;
-            for (Map.Entry<String, Pacs> entry : pacsOriginalMap.entrySet()) {
-                if (ListUtil.isNotEmpty(pacsMap.get(entry.getKey()))) {
-                    for (String uniqueName : pacsMap.get(entry.getKey())) {
-                        Pacs pacsResult = new Pacs();
-                        BeanUtil.copyProperties(entry.getValue(), pacsResult);
-                        pacsResult.setUniqueName(uniqueName);
+            for (Pacs pacsResult : pacs) {
+                if (StringUtil.isBlank(pacsResult.getName())) {
+                    convertPacs.add(pacsResult);
+                    continue;
+                } else {
+                    if (ListUtil.isNotEmpty(pacsMap.get(pacsResult.getName()))) {
+                        for (String uniqueName : pacsMap.get(pacsResult.getName())) {
+                            Pacs convertPacsResult = new Pacs();
+                            BeanUtil.copyProperties(pacsResult, convertPacsResult);
+                            convertPacsResult.setUniqueName(uniqueName);
+                            convertPacs.add(convertPacsResult);
+                        }
+                    } else {
                         convertPacs.add(pacsResult);
                     }
-                } else {
-                    convertPacs.add(entry.getValue());
                 }
             }
         }
@@ -201,9 +205,8 @@ public class TransferFacade {
      */
     public List<Item> addItemUniqueName(List<Item> items, Integer type, String hosCode) {
         if (ListUtil.isEmpty(items)) {
-            return null;
+            return Lists.newLinkedList();
         }
-        Map<String, Item> itemOriginalMap = EntityUtil.makeEntityMap(items, "name");
         List<Item> convertItems = Lists.newLinkedList();
         List<String> nameList = items
                 .stream().map(item -> item.getName())
@@ -217,12 +220,14 @@ public class TransferFacade {
             RespDTO<Map<String, String>> disRespDTO = tranServiceClient.getDiseaseIcdMap(diseaseIcdVO);
             if (RespDTOUtil.respIsOK(disRespDTO)) {
                 disMap = disRespDTO.data;
-                for (Map.Entry<String, Item> entry : itemOriginalMap.entrySet()) {
-                    if (disMap.containsKey(entry.getKey())) {
-                        entry.getValue().setUniqueName(disMap.get(entry.getKey()));
+                for (Item disease : items) {
+                    if (StringUtil.isBlank(disease.getName())) {
+                        continue;
+                    } else {
+                        disease.setUniqueName(disMap.get(disease.getName()));
                     }
-                    convertItems.add(entry.getValue());
                 }
+                convertItems = BeanUtil.listCopyTo(items, Item.class);
             }
         } else if (type.equals(ConceptTypeEnum.Drug.getKey())) {
             //暂无映射关系

+ 1 - 1
common/src/main/java/com/diagbot/biz/push/enums/FeatureTypeEnum.java

@@ -13,7 +13,7 @@ public enum FeatureTypeEnum implements KeyedNamed {
     Feature_Type_Past(1, "既往史"),
     Feature_Type_Other(3, "其他史"),
     Feature_Type_Vital_Result(4, "查体结果"),
-    Feature_Type_Vital_Module(42, "查体模板"),
+    Feature_Type_Vital_Module(41, "查体模板"),
     Feature_Type_Vital_Index(42, "查体指标"),
     Feature_Type_Lis(5, "化验"),
     Feature_Type_Pacs(6, "辅检"),

+ 1 - 1
icss-service/src/main/java/com/diagbot/web/PushController.java

@@ -34,7 +34,7 @@ public class PushController {
 
     @ApiOperation(value = "知识库标准化-推理接口(半结构化)[by:zhaops]",
             notes = "hosCode: 医院编码<br>" +
-                    "featureType:类型(必填多选),1:症状,4:查体结果,41:查体模板,42:查体指标,5:化验,6:辅检,7:诊断,8:治疗方案,22:病情提示(核心指标、危急值、开单合理项、异常值等),多项用逗号分开,String<br>" +
+                    "featureType:类型(必填多选),1:症状,4:查体结果,41:查体模板,42:查体指标,(查体结果和查体指标不能同时取)5:化验,6:辅检,7:诊断,8:治疗方案,22:病情提示(核心指标、危急值、开单合理项、异常值等),多项用逗号分开,String<br>" +
                     "ruleType:规则类型,1:危急值提醒  2:开单合理性  3:管理评估  4:不良反应  5:药物推荐  6:异常值,多项用分号隔开,String<br>" +
                     "age: 年龄(必填)<br>" +
                     "sex:性别(必填),1:男,2:女,Integer<br>" +