模板映射

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

@@ -208,7 +208,9 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
                     queryVo.setCid(basHospitalInfoFacade.getHosCode(s.getHospitalId()));
                     Long modeId ;
                     if (null == s.getModeId()) {
-                        modeId = initModeId(s.getHospitalId(), s.getRecTypeId());
+                        MedicalRecord medicalRecord = new MedicalRecord();
+                        BeanUtil.copyProperties(s, medicalRecord);
+                        modeId = initModeId(medicalRecord);
                     }else {
                         modeId = s.getModeId();
                     }
@@ -522,6 +524,7 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
         } else {
             modeId = Long.valueOf("0");
         }
+
         return modeId;
     }
 

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

@@ -403,8 +403,8 @@ public class TZDBConn {
 				behospitalInfo.setBedName(rs.getString("bedName"));//床位名称
 				behospitalInfo.setInsuranceName(rs.getString("insuranceName"));//医保类别
 				behospitalInfo.setJobType(rs.getString("jobType"));//职业
-				behospitalInfo.setBehospitalDate(rs.getDate("behospitalDate"));//入院时间
-				behospitalInfo.setLeaveHospitalDate(rs.getDate("leaveHospitalDate"));//出院时间
+				behospitalInfo.setBehospitalDate(rs.getString("behospitalDate")!=null?DateUtil.parseDateTime(rs.getString("behospitalDate")):null);//入院时间
+				behospitalInfo.setLeaveHospitalDate(rs.getString("leaveHospitalDate")!=null?DateUtil.parseDateTime(rs.getString("leaveHospitalDate")):null);//出院时间
 				behospitalInfo.setDiagnoseIcd(rs.getString("diagnoseIcd"));//疾病ICD编码
 				behospitalInfo.setDiagnose(rs.getString("diagnose"));//疾病名称
 				behospitalInfo.setBehDoctorId(rs.getString("behDoctorId"));//住院医生ID
@@ -451,10 +451,10 @@ public class TZDBConn {
 				doctorAdviceVO.setMedicineType(rs.getString("medicineType"));//药品类别
 				doctorAdviceVO.setDaFrequency(rs.getString("daFrequency"));//医嘱频率
 				doctorAdviceVO.setDaDealType(rs.getString("daDealType"));//医嘱处理类型
-				doctorAdviceVO.setDaStartDate(rs.getDate("daStartDate"));//医嘱开始时间
+				doctorAdviceVO.setDaStartDate(rs.getString("daStartDate")!=null?DateUtil.parseDateTime(rs.getString("daStartDate")):null);//医嘱开始时间
 				doctorAdviceVO.setDaItemName(rs.getString("daItemName"));//医嘱项目名称
 				doctorAdviceVO.setDaStatus(rs.getString("daStatus"));//医嘱状态判别
-				doctorAdviceVO.setDaStopDate(rs.getDate("daStopDate"));//医嘱结束时间
+				doctorAdviceVO.setDaStopDate(rs.getString("daStopDate")!=null?DateUtil.parseDateTime(rs.getString("daStopDate")):null);//医嘱结束时间
 				doctorAdviceVO.setDaGroupNo(rs.getString("daGroupNo"));//医嘱同组序号
 				doctorAdviceVO.setDaPrescriptionType(rs.getString("daPrescriptionType"));//医嘱处方类型
 				doctorAdviceVO.setDaMedType(rs.getString("daMedType"));//医嘱领药类型

src/main/resources/bootstrap.yml

@@ -2,7 +2,7 @@ spring:
   application:
     name: mrqc-sys
   profiles:
-    active: pre
+    active: local
   main:
     allow-bean-definition-overriding: true