加入选中的手术

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

@@ -66,6 +66,10 @@ public class WordCrfDTO {
      * 选中诊断
      */
     private Item diseaseName;
+    /**
+     * 选中手术
+     */
+    private Item operationName;
      // 诊断
     private List<Item> diag = new ArrayList<>();
     // 当前化验开单项

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

@@ -61,6 +61,9 @@ public class CommonFacade {
         if (searchData.getDiseaseName() != null && StringUtils.isNotBlank(searchData.getDiseaseName().getName())) {
             wordCrfDTO.setDiseaseName(searchData.getDiseaseName());
         }
+        if (searchData.getOperationName() != null && StringUtils.isNotBlank(searchData.getOperationName().getName())) {
+            wordCrfDTO.setOperationName(searchData.getOperationName());
+        }
         if (ListUtil.isNotEmpty(searchData.getLis())) {
             wordCrfDTO.setLis(searchData.getLis());
         }
@@ -197,6 +200,10 @@ public class CommonFacade {
         standConvert.setOperationList(operationList);
         //4.手术及操作
         operationList.addAll(wordCrfDTO.getOperation().stream().filter(z -> StringUtils.isBlank(z.getUniqueName())).map(x ->x.getName()).collect(Collectors.toList()));
+        //5.选中的诊断
+        if(wordCrfDTO.getOperationName() != null && StringUtils.isBlank(wordCrfDTO.getOperationName().getUniqueName())){
+            operationList.add(wordCrfDTO.getOperationName().getName());
+        }
         standConvert.setOperationList(operationList);
         //所有体征
         List<String> vitalList = new ArrayList<>();
@@ -252,6 +259,7 @@ public class CommonFacade {
         CoreUtil.setPropertyList(pastLabel.getOperations(), map.get(StandConvertEnum.operation.getName()));
         CoreUtil.setPropertyList(wordCrfDTO.getOperationOrder(), "name", "uniqueName",map.get(StandConvertEnum.operation.getName()));
         CoreUtil.setPropertyList(wordCrfDTO.getOperation(), "name", "uniqueName",map.get(StandConvertEnum.operation.getName()));
+        CoreUtil.setPropertyList(wordCrfDTO.getOperationName(), "name", "uniqueName",map.get(StandConvertEnum.operation.getName()));
         //输血回填
         CoreUtil.setPropertyList(wordCrfDTO.getTransfusionOrder(), "name", "uniqueName",map.get(StandConvertEnum.transfusion.getName()));
     }