1、病案首页解析问题

2、质控类型初始化问题
3、病案首页结构化，补录等

src/main/java/com/diagbot/facade/data/ADataFacade.java

@@ -142,6 +142,10 @@ public class ADataFacade {
             }else {
                 aHomePageVO.setAgeUnit("月");
             }
+            if(ageMap.contains("时")&& ageMap.contains("分")){
+                aHomePageVO.setAge(ageMap);
+                aHomePageVO.setAgeUnit("");
+            }
         }
         if(StringUtil.isNotEmpty(paramsObj.getString("新生儿出生月数"))){
             aHomePageVO.setNewbornMonth(paramsObj.getString("新生儿出生月数"));

src/main/java/com/diagbot/facade/data/AMedicalRecordFacade.java

@@ -23,6 +23,7 @@ import com.diagbot.vo.MedrecVo;
 import com.diagbot.vo.QueryVo;
 import com.diagbot.vo.data.*;
 import com.google.common.collect.Lists;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -35,6 +36,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 @Component
+@Slf4j
 public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
 
     @Autowired
@@ -322,6 +324,10 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
             }else {
                 aHomePageVO.setAgeUnit("月");
             }
+            if(ageMap.contains("时")&& ageMap.contains("分")){
+                aHomePageVO.setAge(ageMap);
+                aHomePageVO.setAgeUnit("");
+            }
         }
         if(StringUtil.isNotEmpty(paramsObj.getString("新生儿出生月数"))){
             aHomePageVO.setNewbornMonth(paramsObj.getString("新生儿出生月数"));
@@ -331,6 +337,7 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
         }
         aHomePageVO.setNationality(coverValue(paramsObj.getString("国籍"),"GJ"));
         aHomePageVO.setNewbornWeight(paramsObj.getString("新生儿出生体重"));
+        aHomePageVO.setNewbornBehospitalWeight(paramsObj.getString("新生儿入院体重"));
         String[] provinceList = paramsObj.getString("省").split(" ");
         String[] cityList = paramsObj.getString("市").split(" ");
         String[] areaList = paramsObj.getString("县").split(" ");
@@ -417,7 +424,8 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
         } else if(YWDateUtils.isDate(paramsObj.getString("质控日期"), "yyyy年MM月dd日")){
             aHomePageVO.setQcDate(paramsObj.getString("质控日期").replaceAll("[\u4e00-\u9fa5]", "-"));
         }
-        aHomePageVO.setLeaveHospitalType(LeaveHospitalTypeEnum.getName(paramsObj.getString("离院方式")));
+        aHomePageVO.setLeaveHospitalType(paramsObj.getString("离院方式"));
+        //aHomePageVO.setLeaveHospitalType(LeaveHospitalTypeEnum.getName(paramsObj.getString("离院方式")));
         aHomePageVO.setAcceptOrgCode(paramsObj.getString("接收机构名称"));
         aHomePageVO.setAgainBehospitalPlan(paramsObj.getString("三十一天内再住院计划"));
         aHomePageVO.setAgainBehospitalGoal(paramsObj.getString("再住院目的"));
@@ -576,8 +584,12 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
             } else if (behDeptId.equals("52424") || behDeptId.equals("52643") || behDeptId.equals("51766")) {
                 /**儿科日间病历、24小时出入院记录的病历模板、小儿外科住、新生儿科，映射儿科日间*/
                 behDeptId = "52903";
+            }else if(behDeptId.equals("52423")){
+                /*外科(住院)，映射日间病房*/
+                behDeptId="51923";
             }
         }
+        log.info("behDeptId======="+behDeptId);
         //根据性别和科室查看质控类型
         QcType qcType= qcTypeFacade.getOne(new QueryWrapper<QcType>()
                 .eq("beh_dept_id", behDeptId)
@@ -585,7 +597,7 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
                 .eq("sex",behospitalInfo.getSex())
                 .eq("hospital_id", behospitalInfo.getHospitalId())
                 .eq("is_deleted", IsDeleteEnum.N));
-        if (qcType!=null) {
+        if (qcType==null) {
             //如果没有则查看默认模板
             QcType qcTypeD = qcTypeFacade.getOne(new QueryWrapper<QcType>()
                     .eq("default_module", 1)

src/main/java/com/diagbot/util/YiWuFirstPageRecordXmlUtil.java

@@ -106,7 +106,7 @@ public class YiWuFirstPageRecordXmlUtil {
                 if(StringUtil.isNotBlank(text) && text.contains("抢救情况")){
                     int i=0;
                     String tempText = "";
-                    tempText=text.substring(text.indexOf("抢救情况"),text.indexOf("抢救情况")+14);
+                    tempText=text.substring(text.indexOf("抢救情况"),text.indexOf("抢救情况")+20);
                     Pattern p= Pattern.compile("\\d+");
                     Matcher m=p.matcher(tempText);
                     while(m.find()){