禁忌手术加入主诉

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

@@ -195,15 +195,17 @@ public class CommonFacade {
 
         // 【所有手术】
         List<String> operationList = new ArrayList<>();
-        // 1、现病史手术
+        // 1、主诉手术
+        CoreUtil.addList(operationList, CoreUtil.getPropertyList(chiefLabel.getOperations()));
+        // 2、现病史手术
         CoreUtil.addList(operationList, CoreUtil.getPropertyList(presentLabel.getOperations()));
-        // 2、既往史手术
+        // 3、既往史手术
         CoreUtil.addList(operationList, CoreUtil.getPropertyList(pastLabel.getOperations()));
-        // 3、开单手术
+        // 4、开单手术
         CoreUtil.addList(operationList, CoreUtil.filterUniqueList(wordCrfDTO.getOperationOrder()));
-        // 4、结构化手术
+        // 5、结构化手术
         CoreUtil.addList(operationList, CoreUtil.filterUniqueList(wordCrfDTO.getOperation()));
-        // 5、选中手术
+        // 6、选中手术
         if (wordCrfDTO.getOperationName() != null && StringUtils.isBlank(wordCrfDTO.getOperationName().getUniqueName())) {
             operationList.add(wordCrfDTO.getOperationName().getName());
         }
@@ -287,15 +289,17 @@ public class CommonFacade {
         CoreUtil.setPropertyList(vitalLabel.getClinicals(), map.get(StandConvertEnum.vital.toString()));
 
         // 【手术回填】
-        // 1、现病史手术
+        // 1、主诉手术
+        CoreUtil.setPropertyList(chiefLabel.getOperations(), map.get(StandConvertEnum.operation.toString()));
+        // 2、现病史手术
         CoreUtil.setPropertyList(presentLabel.getOperations(), map.get(StandConvertEnum.operation.toString()));
-        // 2、既往史手术
+        // 3、既往史手术
         CoreUtil.setPropertyList(pastLabel.getOperations(), map.get(StandConvertEnum.operation.toString()));
-        // 3、开单手术
+        // 4、开单手术
         CoreUtil.setPropertyList(wordCrfDTO.getOperationOrder(), "name", "uniqueName", map.get(StandConvertEnum.operation.toString()));
-        // 4、结构化手术
+        // 5、结构化手术
         CoreUtil.setPropertyList(wordCrfDTO.getOperation(), "name", "uniqueName", map.get(StandConvertEnum.operation.toString()));
-        // 5、选中手术
+        // 6、选中手术
         CoreUtil.setPropertyList(wordCrfDTO.getOperationName(), "name", "uniqueName", map.get(StandConvertEnum.operation.toString()));
 
         //【输血回填】

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

@@ -206,9 +206,10 @@ public class BillProcess {
             operaData.setStandName(item.getUniqueName());
             operationsItem.add(operaData);
         }
-        CoreUtil.addList(operations_all, presentLabel.getOperations());
-        CoreUtil.addList(operations_all, pastLabel.getOperations());
-        CoreUtil.addList(operations_all, operationsItem);
+        CoreUtil.addList(operations_all, chiefLabel.getOperations()); // 主诉手术
+        CoreUtil.addList(operations_all, presentLabel.getOperations()); // 现病史手术
+        CoreUtil.addList(operations_all, pastLabel.getOperations()); // 既往史手术
+        CoreUtil.addList(operations_all, operationsItem); // 结构化手术
 
         // 【临床表现数据来源】（主诉、现病史）
         List<Clinical> clinicals = new ArrayList<>();