Merge branch 'his/hangzhoufuyou' of http://192.168.2.236:10080/louhr/qc into his/hangzhoufuyou

kernel/src/main/java/com/lantone/qc/kernel/catalogue/hospital/hangzhoufubao/threelevelward/THR0123.java

@@ -40,8 +40,8 @@ public class THR0123 extends QCCatalogue {
         }
         if (inputInfo.getBeHospitalizedDoc() != null && inputInfo.getBeHospitalizedDoc().getStructureMap() != null) {
             Map<String, String> beHospitalStructureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
-            admisTime = beHospitalStructureMap.get(Content.admisDate);
-            String recordTime = beHospitalStructureMap.get("记录时间");
+            admisTime = beHospitalStructureMap.get(Content.behospitalDate);
+            String recordTime = beHospitalStructureMap.get(Content.recordDate);
             if (CatalogueUtil.isEmpty(admisTime) || CatalogueUtil.isEmpty(recordTime)) {
                 return;
             }

public/src/main/java/com/lantone/qc/pub/Content.java

@@ -279,6 +279,8 @@ public class Content {
     public static final String round_doctor = "查房医师";
 
     public static final String admisDate = "入院日期"; //入院记录用
+    public static final String behospitalDate = "入院时间";
+    public static final String recordDate = "记录时间";
     public static final String stayLength = "住院天数";//出院小结用
 
     public static final String timestamp = "timestamp";