Merge remote-tracking branch 'origin/dev-shaoyf' into dev-shaoyf

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

@@ -24,16 +24,19 @@ public class FIRP02992 extends QCCatalogue {
         status.set("0");
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getBeHospitalizedDoc() != null) {
             Map<String, String> fpStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
-            String fpDrugAllergy = fpStructureMap.get(Content.drugAllergy);
-            fpDrugAllergy = StringUtil.isBlank(fpDrugAllergy) ? "" : fpDrugAllergy;
+            if (StringUtil.isBlank(fpStructureMap.get(Content.drugAllergy))) {
+                return;
+            }
+            String fpAllergyDrug = fpStructureMap.get(Content.allergyDrug);
+            fpAllergyDrug = StringUtil.isBlank(fpAllergyDrug) ? "" : fpAllergyDrug;
 
             Map<String, String> beStructureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
             String beDrugAllergy = beStructureMap.get("过敏史");
             beDrugAllergy = StringUtil.isBlank(beDrugAllergy) ? "" : beDrugAllergy;
 
-            if (!fpDrugAllergy.equals(beDrugAllergy)) {
+            if (!fpAllergyDrug.equals(beDrugAllergy)) {
                 String regx = "；|;|,|，|、| ";
-                List<String> fpList = Lists.newArrayList(fpDrugAllergy.split(regx));
+                List<String> fpList = Lists.newArrayList(fpAllergyDrug.split(regx));
                 List<String> beList = Lists.newArrayList(beDrugAllergy.split(regx));
                 if (!ListUtil.equals(fpList, beList)) {
                     status.set("-1");

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR03014.java

@@ -85,7 +85,7 @@ public class THR03014 extends QCCatalogue {
             }
             List<String> resultInfos = new ArrayList<>();
             for (int j = 0; j < roundRecordEveryWeek.size(); j++) {
-                int attendNum = CatalogueUtil.appearNumber(roundRecordEveryWeek.get(j).split(","), Content.attend);
+                int attendNum = CatalogueUtil.appearNumber(roundRecordEveryWeek.get(j).split(","), Content.director);
                 if (attendNum == 0) {
                     //每7天无1次主治医师查房记录
                     status.set("-1");

trans/src/main/java/com/lantone/qc/trans/shaoyf/ShaoyfBeHospitalizedDocTrans.java

@@ -17,6 +17,7 @@ import com.lantone.qc.pub.model.label.VitalLabelSpecial;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.trans.ModelDocTrans;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
+import com.lantone.qc.trans.shaoyf.util.ShaoyfOrdinaryAssistant;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.List;
@@ -48,6 +49,9 @@ public class ShaoyfBeHospitalizedDocTrans extends ModelDocTrans {
             structureMap.put("入院时间", structureMap.get("入病房时间"));
         }
 
+        structureMap.put("签名", structureMap.get("医师签名"));
+        ShaoyfOrdinaryAssistant.techTitleDocRemove(structureMap, "签名");
+
         BeHospitalizedDoc beHospitalizedDoc = beHospitalizedDocGen(structureMap); // 不走共用
         beHospitalizedDoc.setPageData((Map) structureMap);
         return beHospitalizedDoc;

trans/src/main/java/com/lantone/qc/trans/shaoyf/ShaoyfLeaveHospitalDocTrans.java

@@ -26,6 +26,8 @@ public class ShaoyfLeaveHospitalDocTrans extends ModelDocTrans {
         sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
         sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
+        structureMap.put("入院情况",structureMap.get("入院病情"));
+        structureMap.put("出院时间",structureMap.get("出院日期"));
         LeaveHospitalDoc leaveHospitalDoc = new LeaveHospitalDoc();
         leaveHospitalDoc.setStructureMap(structureMap);
         leaveHospitalDoc.setPageData((Map) structureMap);