规则更新

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0023.java

@@ -23,7 +23,8 @@ public class BEH0023 extends QCCatalogue {
         List<Pacs> pacses = inputInfo.getBeHospitalizedDoc().getPresentLabel().getPacses();
         List<Treat> treats = inputInfo.getBeHospitalizedDoc().getPresentLabel().getTreats();
         List<Operation> operations = inputInfo.getBeHospitalizedDoc().getPresentLabel().getOperations();
-        if(lises == null && pacses.size() == 0 && treats.size() == 0 && operations.size() == 0){
+        List<Medicine> medicines = inputInfo.getBeHospitalizedDoc().getPresentLabel().getMedicines();
+        if(lises == null && pacses.size() == 0 && treats.size() == 0 && operations.size() == 0 && medicines.size() == 0){
             status.set("-1");
         }
     }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0408.java

@@ -22,7 +22,8 @@ public class BEH0408 extends QCCatalogue {
         status.set("0");
         Map<String, String> structureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
         if(structureMap != null){
-            String name = structureMap.get("联系地址");
+//            String name = structureMap.get("联系地址");
+            String name = structureMap.get("户口地址");
             if(CatalogueUtil.isEmpty(name)){
                 status.set("-1");
             }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0174.java

@@ -23,7 +23,7 @@ public class FIRP0174 extends QCCatalogue {
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureExtMap() != null) {
             Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureExtMap();
             List<Map<String, String>> outpatientEmergencyDiag = (List) firstpageStructureMap.get(Content.dischargeDiag);
-            if (outpatientEmergencyDiag != null && outpatientEmergencyDiag.size() == 0) {
+            if (outpatientEmergencyDiag == null && outpatientEmergencyDiag.size() == 0) {
                 status.set("-1");
             }
         }

kernel/src/main/java/com/lantone/qc/kernel/structure/ai/process/EntityProcessClinic.java

@@ -99,6 +99,15 @@ public class EntityProcessClinic extends EntityProcess {
                 treats.add(treat);
             }
             presentLabel.setTreats(treats);
+            //治疗
+            List<Lemma> cureLemmas_me = createEntityTree(aiOut, EntityEnum.DRUG.toString());
+            List<Medicine> medicines = new ArrayList<>();
+            for (Lemma lemma : cureLemmas_me) {
+                Medicine medicine = new Medicine();
+                medicine.setName(lemma.getText());
+                medicines.add(medicine);
+            }
+            presentLabel.setMedicines(medicines);
 
             //手术
             List<Lemma> operationLemmas = createEntityTree(aiOut, EntityEnum.OPERATION.toString());

public/src/main/java/com/lantone/qc/pub/model/label/PresentLabel.java

@@ -24,6 +24,8 @@ public class PresentLabel extends GeneralLabel {
     private List<Lis> lises;
     //治疗
     private List<Treat> treats;
+    //药物
+    private List<Medicine> medicines;
     //一般情况
     private List<General> gens = new ArrayList<>();
     //一般情况描述