1.义乌入院记录trans修改

2.现病史缺少发病以来一般情况描述添加判断

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/behospitalized/BEH0022.java

@@ -32,6 +32,11 @@ public class BEH0022 extends QCCatalogue {
             status.set("0");
             return;
         }
+        String presentText = presentLabel.getText();
+        if (presentText.contains("发病以来")) {
+            status.set("0");
+            return;
+        }
         List<GeneralDesc> generals = presentLabel.getGenerals();
         if (generals != null && generals.size() > 0) {
             status.set("0");
@@ -43,10 +48,10 @@ public class BEH0022 extends QCCatalogue {
             return;
         }
         //增加强判断，现病史有无"病来..."
-        BeHospitalizedDoc beHospitalizedDoc=inputInfo.getBeHospitalizedDoc();
-        Map<String,String> beHospitalizedDocStructureMap=beHospitalizedDoc.getStructureMap();
-        if(beHospitalizedDocStructureMap.get("现病史")!=null&&(beHospitalizedDocStructureMap.get("现病史").contains("病来")
-                || beHospitalizedDocStructureMap.get("现病史").contains("孕来"))){
+        BeHospitalizedDoc beHospitalizedDoc = inputInfo.getBeHospitalizedDoc();
+        Map<String, String> beHospitalizedDocStructureMap = beHospitalizedDoc.getStructureMap();
+        if (beHospitalizedDocStructureMap.get("现病史") != null && (beHospitalizedDocStructureMap.get("现病史").contains("病来")
+                || beHospitalizedDocStructureMap.get("现病史").contains("孕来"))) {
             status.set("0");
             return;
         }

trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuBeHospitalizedDocTrans.java

@@ -257,9 +257,9 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
         PastLabel pastLabel = new PastLabel();
         pastLabel.setCrfLabel(false);
         if (StringUtil.isNotBlank(structureMap.get("既往史"))) {
-            presentLabel.setText(structureMap.get("既往史"));
+            pastLabel.setText(structureMap.get("既往史"));
         } else if (StringUtil.isNotBlank(structureMap.get("入院情况"))) {
-            presentLabel.setText(structureMap.get("入院情况"));
+            pastLabel.setText(structureMap.get("入院情况"));
         }
         beHospitalizedDoc.setPastLabel(pastLabel);