shiyue 3 years ago
parent
commit
b81f0cf5a6

+ 2 - 2
src/main/java/com/diagbot/facade/data/StructuralOldDataFacade.java

@@ -109,8 +109,8 @@ public class StructuralOldDataFacade {
      */
     public void  sendStructuralDataOld(StructuralDataVo structuralDataVo){
         try {
-            String sql ="select * from med_behospital_info t  where  t.behospitalDate >=to_date('"+structuralDataVo.getStartDate()
-                    + "','yyyymmdd') and t.behospitalDate <= to_date('"+structuralDataVo.getStopDate()+"','yyyymmdd')";
+            String sql ="select * from med_behospital_info t  where  t.leaveHospitalDate >=to_date('"+structuralDataVo.getStartDate()
+                    + "','yyyymmdd') and t.leaveHospitalDate <= to_date('"+structuralDataVo.getStopDate()+"','yyyymmdd')";
 
 //            String sql ="select t.behospitalCode ,t.patientId  from med_behospital_info t where t.leaveHospitalDate is null";
             List<StructuralDataVo> strings =fjtzdbConnHarp.getBehospitalInfoDate(sql);

+ 6 - 1
src/main/java/com/diagbot/util/FJTZDBConnHarp.java

@@ -258,15 +258,20 @@ public class FJTZDBConnHarp {
 				behospitalInfo.setDoctorId(rs.getString("doctorId"));//医生ID
 				behospitalInfo.setDoctorName(rs.getString("doctorName"));//医生姓名
 
+
 				if (null!=rs.getString("behospitalDate")) {
 					behospitalInfo.setBehospitalDate(DateUtil.parseDate(rs.getString("behospitalDate"),DateUtil.DATE_TIME_FORMAT));//入院时间
 				}
 				if (null!=rs.getString("leaveHospitalDate")) {
-					behospitalInfo.setLeaveHospitalDate(DateUtil.parseDate(rs.getString("leaveHospitalDate"),DateUtil.DATE_FORMAT));//出院日期
+					behospitalInfo.setLeaveHospitalDate(DateUtil.parseDate(rs.getString("leaveHospitalDate"),DateUtil.DATE_TIME_FORMAT));//出院日期
+					behospitalInfo.setIsPlacefile("1");//归档标志
 				}
 				if (null!=rs.getString("birthday")) {
 					behospitalInfo.setBirthday(DateUtil.parseDate(rs.getString("birthday"),DateUtil.DATE_FORMAT));//出生日期
 				}
+				if (null!=rs.getString("placefileDate")) {
+					behospitalInfo.setPlacefileDate(DateUtil.parseDate(rs.getString("placefileDate"),DateUtil.DATE_TIME_FORMAT));//归档日期
+				}
 				behospitalInfoList.add(behospitalInfo);
 			}
 		} catch (Exception e) {