Merge remote-tracking branch 'origin/master'

src/main/java/com/diagbot/facade/CommonFacade.java

@@ -70,27 +70,42 @@ public class CommonFacade {
         diagList.addAll(CoreUtil.getPropertyList(pastLabel.getDiags()));
 
         //所有化验(结构化数据)
+        List<String> allLis = new ArrayList<>();
+        //普通化验
         List<Lis> lis = wordCrfDTO.getLis();
         if (ListUtil.isNotEmpty(lis)) {
             List<String> lis_unique = lis.stream().filter(x -> StringUtils.isBlank(x.getUniqueName()))
                     .map(x -> x.getName() + x.getDetailName()).collect(Collectors.toList());
-            standConvert.setLisList(lis_unique);
+            allLis.addAll(lis_unique);
         }
+        //开单化验
+        List<Lis> lisOrder = wordCrfDTO.getLisOrder();
+        if (ListUtil.isNotEmpty(lisOrder)) {
+            List<String> lis_unique = lisOrder.stream().filter(x -> StringUtils.isBlank(x.getUniqueName()))
+                    .map(x -> x.getName() + x.getDetailName()).collect(Collectors.toList());
+            allLis.addAll(lis_unique);
+        }
+        standConvert.setLisList(allLis);
 
         //所有辅助检查(结构化数据)
+        List<String> allPacs = new ArrayList<>();
         List<Pacs> pacs = wordCrfDTO.getPacs();
         if (ListUtil.isNotEmpty(pacs)) {
             List<String> pacss_unique = pacs.stream().filter(x -> StringUtils.isBlank(x.getUniqueName()))
                     .map(x -> x.getName()).collect(Collectors.toList());
-            standConvert.setPacsList(pacss_unique);
+            allPacs.addAll(pacss_unique);
         }
-
+        //开单检查
+        allPacs.addAll(wordCrfDTO.getPacsOrder().stream().filter(z -> StringUtils.isBlank(z.getUniqueName())).map(x -> x.getName()).collect(Collectors.toList()));
+        standConvert.setPacsList(allPacs);
         //所有药品(现病史、既往史)
         List<String> drugList = new ArrayList<>();
         //1、现病史中的药品
         drugList.addAll(CoreUtil.getPropertyList(presentLabel.getMedicines()));
         //2、既往史(药物过敏)
         drugList.addAll(CoreUtil.getPropertyList(pastLabel.getAllergyMedicines()));
+        //3、开单药品
+        drugList.addAll(wordCrfDTO.getDrugOrder().stream().filter(z ->StringUtils.isBlank(z.getUniqueName())).map(x ->x.getName()).collect(Collectors.toList()));
         standConvert.setDrugList(drugList);
 
         //所有手术(现病史、既往史)
@@ -99,8 +114,11 @@ public class CommonFacade {
         operationList.addAll(CoreUtil.getPropertyList(presentLabel.getOperations()));
         //2、既往史中的手术
         operationList.addAll(CoreUtil.getPropertyList(pastLabel.getOperations()));
+        //3.开单手术
+        operationList.addAll(wordCrfDTO.getOperationOrder().stream().filter(z -> StringUtils.isBlank(z.getUniqueName())).map(x ->x.getName()).collect(Collectors.toList()));
         standConvert.setOperationList(operationList);
 
+
         //所有体征
         List<String> vitalList = new ArrayList<>();
         VitalLabel vitalLabel = wordCrfDTO.getVitalLabel();
@@ -130,15 +148,19 @@ public class CommonFacade {
         //药品回填
         CoreUtil.setPropertyList(presentLabel.getMedicines(), map.get(StandConvertEnum.drug.getName()));
         CoreUtil.setPropertyList(pastLabel.getAllergyMedicines(), map.get(StandConvertEnum.drug.getName()));
+        CoreUtil.setPropertyList(wordCrfDTO.getDrugOrder(),"name", "uniqueName", map.get(StandConvertEnum.drug.getName()));
         // TODO: 2020/8/5 化验回填
         CoreUtil.setPropertyList(lis, "name", "detailName", "uniqueName", map.get(StandConvertEnum.lis.getName()));
+        CoreUtil.setPropertyList(wordCrfDTO.getLisOrder(), "name", "detailName", "uniqueName", map.get(StandConvertEnum.lis.getName()));
         // TODO: 2020/8/5 辅助检查回填
         CoreUtil.setPropertyList(pacs, "name", "uniqueName", map.get(StandConvertEnum.pacs.getName()));
+        CoreUtil.setPropertyList(wordCrfDTO.getPacsOrder(), "name", "uniqueName", map.get(StandConvertEnum.pacs.getName()));
         //体征回填
         CoreUtil.setPropertyList(vitalLabel.getVitals(), map.get(StandConvertEnum.vital.getName()));
         //手术回填
         CoreUtil.setPropertyList(presentLabel.getOperations(), map.get(StandConvertEnum.operation.getName()));
         CoreUtil.setPropertyList(pastLabel.getOperations(), map.get(StandConvertEnum.operation.getName()));
+        CoreUtil.setPropertyList(wordCrfDTO.getOperationOrder(), "name", "uniqueName",map.get(StandConvertEnum.operation.getName()));
     }
 
     /**