Merge branch 'beilun/dev-fqw' into beilun/dev

dbanaly/src/main/java/com/lantone/qc/dbanaly/facade/yiwu/YiWuXmlUtil.java

@@ -76,7 +76,7 @@ public class YiWuXmlUtil {
     //获取 XInputField 的键
     private static String getXInputFieldKey(Element xInputFieldElement, String tablePreTxt) {
         String key = null;
-        String[] elementNames = { "Name", "BackgroundText", "ToolTip" };
+        String[] elementNames = {"BackgroundText", "ToolTip" ,"Name"};
         for (String elementName : elementNames) {
             key = xInputFieldElement.elementTextTrim(elementName);
             if (StringUtil.isNotBlank(key)) {

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

@@ -50,10 +50,16 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
             sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
             sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts, modeId);
+            //新生儿科姓名+姓名问题解决
             if(structureMap.containsKey("姓名")){
                 String value =structureMap.get("姓名").split(" ")[0];
                 structureMap.put("姓名",value);
             }
+            //产科孕产次
+            if(structureMap.containsKey("入院记录")){
+                String value =structureMap.get("入院记录").split(" ")[0];
+                structureMap.put("孕产次",value);
+            }
             OrdinaryAssistant.removeBlank(structureMap);
         }
         /*if (StringUtils.isEmpty(structureMap.get("入院时间")) && StringUtils.isNotEmpty(structureMap.get("入病房时间"))) {
@@ -134,11 +140,11 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
             "末次月经日期=末次月经",
             "入院诊断1=初步诊断",
             "记录医师=初步诊断医师签名",
-            "病历内容=初步诊断医师签名",
-            "日期=初步诊断日期",
             "修正诊断签名日期=修正诊断日期",
             "修正诊断一医师签名=修正诊断医师签名",
-            "患者姓名=姓名"
+            "患者姓名=姓名",
+            "年月日=初步诊断日期",
+            "年月日时分=初步诊断日期"
 
     );