调整同步

src/main/java/com/diagbot/entity/BasDeptInfo.java

@@ -1,5 +1,8 @@
 package com.diagbot.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
 import java.time.LocalDateTime;
 import java.io.Serializable;
 
@@ -18,6 +21,7 @@ public class BasDeptInfo implements Serializable {
     /**
      * 科室编码（HIS导入）
      */
+    @TableId(value = "dept_id",type = IdType.INPUT)
     private String deptId;
 
     /**

src/main/java/com/diagbot/facade/DataFacade.java

@@ -87,9 +87,6 @@ public class DataFacade {
             basDeptInfoServiceImpl.saveBatch(add);
         }
         if (updateE != null && updateE.size() != 0) {
-            updateE.forEach((e) -> {
-                e.setGmtModified(new Date());
-            });
             basDeptInfoServiceImpl.updateBatchById(updateE);
         }
     }
@@ -143,7 +140,7 @@ public class DataFacade {
                 if(qcType!=null){
                     s.setQcTypeId(qcType.getId());
                 }else{
-                    s.setQcTypeId(null);
+                    s.setQcTypeId(Long.valueOf("0"));
                 }
             }
 
@@ -152,21 +149,17 @@ public class DataFacade {
             queryWrapper.eq("hospital_id", Long.valueOf("3"));
             BehospitalInfo behospitalInfo = behospitalInfoServiceImpl.getOne(queryWrapper);
             if (behospitalInfo != null) {
+                s.setGmtModified(new Date());
                 updateE.add(s);
             } else {
+                s.setGmtCreate(new Date());
                 add.add(s);
             }
         });
         if (add != null && add.size() != 0) {
-            add.forEach((e) -> {
-                e.setGmtCreate(new Date());
-            });
             behospitalInfoServiceImpl.saveBatch(add);
         }
         if (updateE != null && updateE.size() != 0) {
-            updateE.forEach((e) -> {
-                e.setGmtModified(new Date());
-            });
             behospitalInfoServiceImpl.updateBatchById(updateE);
         }
     }
@@ -184,8 +177,10 @@ public class DataFacade {
                 queryWrapper.in("doctor_advice_id", s.getDoctorAdviceId());
                 DoctorAdvice doctorAdvice = doctorAdviceServiceImpl.getOne(queryWrapper);
                 if (doctorAdvice != null) {
+                    s.setGmtModified(new Date());
                     updateE.add(s);
                 } else {
+                    s.setGmtCreate(new Date());
                     add.add(s);
                 }
             });
@@ -193,9 +188,6 @@ public class DataFacade {
                 doctorAdviceServiceImpl.saveBatch(add);
             }
             if (updateE != null && updateE.size() > 0) {
-                updateE.forEach((e) -> {
-                    e.setGmtModified(new Date());
-                });
                 doctorAdviceServiceImpl.updateBatchById(updateE);
             }
         }
@@ -246,7 +238,7 @@ public class DataFacade {
                 if(mode!=null){
                     s.setModeId(mode.getStandModelId());
                 }else{
-                    s.setModeId(null);
+                    s.setModeId(Long.valueOf("0"));
                 }
 
                 //新增或修改
@@ -254,8 +246,10 @@ public class DataFacade {
                 queryWrapper.in("rec_id", s.getRecId());
                 MedicalRecord medicalRecord = medicalRecordServiceImpl.getOne(queryWrapper);
                 if (medicalRecord != null) {
+                    s.setGmtModified(new Date());
                     updateE.add(s);
                 } else {
+                    s.setGmtCreate(new Date());
                     add.add(s);
                 }
             });
@@ -263,9 +257,6 @@ public class DataFacade {
                 medicalRecordServiceImpl.saveBatch(add);
             }
             if (updateE != null && updateE.size() > 0) {
-                updateE.forEach((e) -> {
-                    e.setGmtModified(new Date());
-                });
                 medicalRecordServiceImpl.updateBatchById(updateE);
             }
         }
@@ -284,8 +275,10 @@ public class DataFacade {
                 queryWrapper.in("rec_id", s.getRecId());
                 MedicalRecordContent mrContent = medicalRecordContentServiceImpl.getOne(queryWrapper);
                 if (mrContent != null) {
+                    s.setGmtModified(new Date());
                     updateE.add(s);
                 } else {
+                    s.setGmtCreate(new Date());
                     add.add(s);
                 }
             });
@@ -293,9 +286,6 @@ public class DataFacade {
                 medicalRecordContentServiceImpl.saveBatch(add);
             }
             if (updateE != null && updateE.size() > 0) {
-                updateE.forEach((e) -> {
-                    e.setGmtModified(new Date());
-                });
                 medicalRecordContentServiceImpl.updateBatchById(updateE);
             }
         }
@@ -314,8 +304,10 @@ public class DataFacade {
                 queryWrapper.eq("home_page_id", s.getHomePageId());
                 HomePage homePage = homePageServiceImpl.getOne(queryWrapper);
                 if (homePage != null) {
+                    s.setGmtModified(new Date());
                     updateE.add(s);
                 } else {
+                    s.setGmtCreate(new Date());
                     add.add(s);
                 }
             });
@@ -323,9 +315,6 @@ public class DataFacade {
                 homePageServiceImpl.saveBatch(add);
             }
             if (updateE != null && updateE.size() > 0) {
-                updateE.forEach((e) -> {
-                    e.setGmtModified(new Date());
-                });
                 homePageServiceImpl.updateBatchById(updateE);
             }
         }
@@ -343,8 +332,10 @@ public class DataFacade {
                     queryWrapper.eq("operation_order_no", s.getOperationOrderNo());
                     HomeOperationInfo operationInfo = homeOperationInfoServiceImpl.getOne(queryWrapper);
                     if (operationInfo != null) {
+                        s.setGmtModified(new Date());
                         updateE.add(s);
                     } else {
+                        s.setGmtCreate(new Date());
                         add.add(s);
                     }
                 }
@@ -353,9 +344,6 @@ public class DataFacade {
                 homeOperationInfoServiceImpl.saveBatch(add);
             }
             if (updateE != null && updateE.size() > 0) {
-                updateE.forEach((e) -> {
-                    e.setGmtModified(new Date());
-                });
                 homeOperationInfoServiceImpl.updateBatchById(updateE);
             }
         }
@@ -373,19 +361,18 @@ public class DataFacade {
                     queryWrapper.eq("diagnose_order_no", s.getDiagnoseOrderNo());
                     HomeDiagnoseInfo diagnoseInfo = homeDiagnoseInfoServiceImpl.getOne(queryWrapper);
                     if (diagnoseInfo != null) {
+                        s.setGmtModified(new Date());
                         updateE.add(s);
                     } else {
+                        s.setGmtCreate(new Date());
                         add.add(s);
                     }
                 }
             });
-            if (add != null && add.size() > 0) {
+            if (add != null) {
                 homeDiagnoseInfoServiceImpl.saveBatch(add);
             }
-            if (updateE != null && updateE.size() > 0) {
-                updateE.forEach((e) -> {
-                    e.setGmtModified(new Date());
-                });
+            if (updateE != null) {
                 homeDiagnoseInfoServiceImpl.updateBatchById(updateE);
             }
         }

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

@@ -195,7 +195,7 @@ public class TZDBConn {
 				//homeDiagnoseVO.setLeaveHospitalType(rs.getString("RYQKBM"));//出院情况
 				//homeDiagnoseVO.setPathologyDiagnose(rs.getString("BASYID"));//病理号
 				homeDiagnose.setIcdCode(rs.getString("ICDM"));//诊断编码
-				homeDiagnose.setGmtCreate(new Date());
+
 				homeDiagnoseVOList.add(homeDiagnose);
 			}
 		} catch (Exception e) {
@@ -234,7 +234,6 @@ public class TZDBConn {
 				homeOperationVO.setOperationLevel(rs.getString("SSJBID"));//手术级别
 				homeOperationVO.setAnaesthesiaName(rs.getString("MZFFMC"));//麻醉方式
 				homeOperationVO.setShamOperationName(rs.getString("NSSMC"));//拟手术名称
-				homeOperationVO.setGmtCreate(new Date());
 				
 				homeOperationVOList.add(homeOperationVO);
 			}
@@ -275,7 +274,7 @@ public class TZDBConn {
 				homePageVO.setName(rs.getString("BRBAXM"));//姓名
 				homePageVO.setSex(rs.getString("BRBAXB"));//性别
 				homePageVO.setBirthday(rs.getDate("BRCSRQ"));//出生日期
-				homePageVO.setAge(rs.getString("BRDQNL"));//病人年龄
+				homePageVO.setAge(rs.getString("BRDQNL").equals("-")?null:rs.getString("BRDQNL"));//病人年龄
 				homePageVO.setAgeUnit(rs.getString("BRNLDW"));//年龄单位
 				homePageVO.setNationality(rs.getString("BRBAGJ"));//国籍
 				homePageVO.setNewbornMonth(rs.getString("YENLYS"));//新生儿出生月数
@@ -518,8 +517,6 @@ public class TZDBConn {
 				homePageVO.setRescueSuccessNum(rs.getString("QJCGCS"));//病人抢救成功次数
 				homePageVO.setIsAutoLeavehospital(rs.getString("ZDCYPB"));//是否为自动出院
 				homePageVO.setReturnToType(rs.getString("CYQKDM"));//转归情况
-				
-				homePageVO.setGmtCreate(new Date());
 
 				homePageList.add(homePageVO);
 				
@@ -567,8 +564,6 @@ public class TZDBConn {
 				behospitalInfo.setDoctorId(rs.getString("ZZYSID"));//医生ID
 				behospitalInfo.setDoctorName(rs.getString("ZZYSXM"));//医生姓名
 				
-				behospitalInfo.setGmtCreate(new Date());
-				
 				behospitalInfoList.add(behospitalInfo);
 			}
 		} catch (Exception e) {
@@ -617,7 +612,7 @@ public class TZDBConn {
 				doctorAdviceVO.setDoctorNotice(rs.getString("YSZTSM"));//医生嘱托
 				doctorAdviceVO.setDoctorId(rs.getString("KDYSID"));//开单医生ID
 				doctorAdviceVO.setDoctorName(rs.getString("KDYSMC"));//开单医生姓名
-				doctorAdviceVO.setGmtCreate(new Date());
+
 				doctorAdviceList.add(doctorAdviceVO);
 			}
 		} catch (Exception e) {
@@ -650,7 +645,6 @@ public class TZDBConn {
 				medicalRecord.setRecDate(rs.getString("BCJLSJ"));//病历日期
 				medicalRecord.setRecTitle(rs.getString("BLJLMC"));//病历标题
 				medicalRecord.setModeId(Long.valueOf(rs.getString("BLLBID")));//对应his类别ID
-				medicalRecord.setGmtCreate(new Date());
 				
 				medicalRecordList.add(medicalRecord);
 			}
@@ -682,7 +676,7 @@ public class TZDBConn {
 				mrContent.setRecId(rs.getString("BLJLID"));
 				//mrContent.setHtmlText(rs.getString("HTMLSJ"));
 				mrContent.setXmlText(rs.getString("BLJLNR"));
-				mrContent.setGmtCreate(new Date());
+
 				mrContentList.add(mrContent);
 			}
 		} catch (Exception e) {