其他值提醒化验

src/main/java/com/diagbot/dto/WordCrfDTO.java

@@ -38,6 +38,8 @@ public class WordCrfDTO {
     private List<Lis> lis = new ArrayList<>();
     // 辅检项目和结果
     private List<Pacs> pacs = new ArrayList<>();
+    // 药品
+    private List<Drug> drug = new ArrayList<>();
     // 主诉
     private ChiefLabel chiefLabel = new ChiefLabel();
     // 现病史

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

@@ -55,6 +55,9 @@ public class CommonFacade {
         if (ListUtil.isNotEmpty(searchData.getPacs())) {
             wordCrfDTO.setPacs(searchData.getPacs());
         }
+        if (ListUtil.isNotEmpty(searchData.getDrug())) {
+            wordCrfDTO.setDrug(searchData.getDrug());
+        }
         if (ListUtil.isNotEmpty(searchData.getLisOrder())) {
             wordCrfDTO.setLisOrder(searchData.getLisOrder());
         }
@@ -157,6 +160,9 @@ public class CommonFacade {
         //3、开单药品
         drugList.addAll(wordCrfDTO.getDrugOrder().stream().filter(z ->StringUtils.isBlank(z.getUniqueName())).map(x ->x.getName()).collect(Collectors.toList()));
         standConvert.setDrugList(drugList);
+        //4、医嘱药品
+        drugList.addAll(wordCrfDTO.getDrug().stream().filter(z ->StringUtils.isBlank(z.getUniqueName())).map(x ->x.getName()).collect(Collectors.toList()));
+        standConvert.setDrugList(drugList);
 
         //所有手术(现病史、既往史)
         List<String> operationList = new ArrayList<>();
@@ -207,6 +213,7 @@ public class CommonFacade {
         CoreUtil.setPropertyList(presentLabel.getTakeMedicine(), 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()));
+        CoreUtil.setPropertyList(wordCrfDTO.getDrug(),"name", "uniqueName", map.get(StandConvertEnum.drug.getName()));
         //化验回填
         CoreUtil.setPropertyList(lis, "name", "detailName", "uniqueName", map.get(StandConvertEnum.lis.getName()));
         CoreUtil.setPropertyList(wordCrfDTO.getLisOrder(), "name", "detailName", "uniqueName", map.get(StandConvertEnum.lis.getName()));

src/main/java/com/diagbot/process/OtherTipProcess.java

@@ -39,7 +39,7 @@ public class OtherTipProcess {
                     if (TypeEnum.disease.getName().equals(nodeNeoDTO.getTermtype())) { // 诊断
                         flag = CoreUtil.compareNameWithNodeNeoDTO(nodeNeoDTO, wordCrfDTO.getDiag());
                     } else if (TypeEnum.drug.getName().equals(nodeNeoDTO.getTermtype())) { // 药品
-                        flag = CoreUtil.compareNameWithNodeNeoDTO(nodeNeoDTO, wordCrfDTO.getDrugOrder());
+                        flag = CoreUtil.compareNameWithNodeNeoDTO(nodeNeoDTO, wordCrfDTO.getDrug());
                     }
                     if (flag) {
                         String content = otherTipNeoDTO.getName() + otherTipNeoDTO.getDetailName();