Merge branch 'dev-1.2' into dev

kernel/src/main/java/com/lantone/qc/kernel/structure/ai/ThreeLevelWardAI.java

@@ -257,6 +257,9 @@ public class ThreeLevelWardAI extends ModelAI {
         for (RescueDoc rescueDoc : rescueDocs) {
             Map<String, String> rescueStructureMap = rescueDoc.getStructureMap();
             recordTime = rescueStructureMap.get("抢救时间");
+            if(recordTime == null){
+                continue;
+            }
             Date recordDate = StringUtil.parseDateTime(recordTime);
             if (recordDate == null) {
                 continue;

trans/src/main/java/com/lantone/qc/trans/changx/ChangxBeHospitalizedDocTrans.java

@@ -66,12 +66,14 @@ public class ChangxBeHospitalizedDocTrans extends ModelDocTrans {
             "联系电话=电话",
             "供史者++++病史叙述者=病史陈述者",
             "++++病史叙述者=病史陈述者",
+            "供史者++++供史者新=病史陈述者",
             "病史叙述者=病史陈述者",
             "婚育史:=婚育史",
             "外生殖器++++外生殖器文本框=",
             "户口地址=联系地址",
             "家庭住址++++现住址=现住址",
             "产次++++产=产次",
+            "家长姓名++++家长=家长姓名",
             "职业++++首页职业新=职业"
     );