no message

controllers/sync.go

 			}
 			// 第三步：开始同步数据
 			// 同步医院信息  t_hd_hospital
-			city.SyncHospital(orgDb, org.OrgId, org.HospitalId, org.InstType, org.DepartmentName)
-			// 同步水处理器  t_hd_wm
-			city.SyncWMS(orgDb, org.OrgId, org.HospitalId)
-			// // 同步员工 t_hd_staff
-			city.SyncStaff(orgDb, org.OrgId, org.HospitalId)
-			// // 同步病人 t_hd_patient
-			city.SyncPatient(orgDb, org.OrgId, org.HospitalId)
-			// // 同步排班  t_hd_shift
-			city.SyncShift(orgDb, org.OrgId, org.HospitalId)
-			// 同步处方 t_hd_ps
-			city.SyncPs(orgDb, org.OrgId, org.HospitalId)
-			// 同步处方药品 t_hd_ps
-			city.SyncPsMedicine(orgDb, org.OrgId, org.HospitalId)
-			// // 同步转院信息 t_hd_patient_out
-			city.SyncPatientOut(orgDb, org.OrgId, org.HospitalId)
-			// 同步处方信息 t_hd_doctors_advice
-			city.SyncDoctorAdvice(orgDb, org.OrgId, org.HospitalId)
-			// 同步透中信息 t_hd_middle
-			city.SyncMiddle(orgDb, org.OrgId, org.HospitalId)
-			// // 同步设备 t_hd_other_machine
-			city.SyncOtherMachine(orgDb, org.OrgId, org.HospitalId)
-			// // 同步维修 t_hd_maintain
-			city.SyncMachineRepair(orgDb, org.OrgId, org.HospitalId)
-			// // 同步设备 t_hd_dm
-			city.SyncDM(orgDb, org.OrgId, org.HospitalId)
-			// // 同步患者透析记录 t_hd_dialysis
-			city.SyncDialysis(orgDb, org.OrgId, org.HospitalId)
-			// 同步透析床位分区 t_hd_division
-			city.SyncDivision(orgDb, org.OrgId, org.HospitalId)
-			// 患者通路信息表（T_HD_ACCESS）
-			city.SyncAccess(orgDb, org.OrgId, org.HospitalId)
-			// 透析床位表（T_HD_SICKBED）
-			city.SyncSickbed(orgDb, org.OrgId, org.HospitalId)
-			// 患者诊断信息表（T_HD_DIAGNOSIS）
-			city.SyncDiagnosis(orgDb, org.OrgId, org.HospitalId)
+			// city.SyncHospital(orgDb, org.OrgId, org.HospitalId, org.InstType, org.DepartmentName)
+			// // 同步水处理器  t_hd_wm
+			// city.SyncWMS(orgDb, org.OrgId, org.HospitalId)
+			// // // 同步员工 t_hd_staff
+			// city.SyncStaff(orgDb, org.OrgId, org.HospitalId)
+			// // // 同步病人 t_hd_patient
+			// city.SyncPatient(orgDb, org.OrgId, org.HospitalId)
+			// // // 同步排班  t_hd_shift
+			// city.SyncShift(orgDb, org.OrgId, org.HospitalId)
+			// // 同步处方 t_hd_ps
+			// city.SyncPs(orgDb, org.OrgId, org.HospitalId)
+			// // 同步处方药品 t_hd_ps
+			// city.SyncPsMedicine(orgDb, org.OrgId, org.HospitalId)
+			// // // 同步转院信息 t_hd_patient_out
+			// city.SyncPatientOut(orgDb, org.OrgId, org.HospitalId)
+			// // 同步处方信息 t_hd_doctors_advice
+			// city.SyncDoctorAdvice(orgDb, org.OrgId, org.HospitalId)
+			// // 同步透中信息 t_hd_middle
+			// city.SyncMiddle(orgDb, org.OrgId, org.HospitalId)
+			// // // 同步设备 t_hd_other_machine
+			// city.SyncOtherMachine(orgDb, org.OrgId, org.HospitalId)
+			// // // 同步维修 t_hd_maintain
+			// city.SyncMachineRepair(orgDb, org.OrgId, org.HospitalId)
+			// // // 同步设备 t_hd_dm
+			// city.SyncDM(orgDb, org.OrgId, org.HospitalId)
+			// // // 同步患者透析记录 t_hd_dialysis
+			// city.SyncDialysis(orgDb, org.OrgId, org.HospitalId)
+			// // 同步透析床位分区 t_hd_division
+			// city.SyncDivision(orgDb, org.OrgId, org.HospitalId)
+			// // 患者通路信息表（T_HD_ACCESS）
+			// city.SyncAccess(orgDb, org.OrgId, org.HospitalId)
+			// // 透析床位表（T_HD_SICKBED）
+			// city.SyncSickbed(orgDb, org.OrgId, org.HospitalId)
+			// // 患者诊断信息表（T_HD_DIAGNOSIS）
+			// city.SyncDiagnosis(orgDb, org.OrgId, org.HospitalId)
 			//  患者传染病检查记录表（T_HD_INFECTION
 			city.SyncInfection(orgDb, org.OrgId, org.HospitalId)
-			//  透析并发症记录表（T_HD_COMPLICATION）
-			city.SyncComplication(orgDb, org.OrgId, org.HospitalId)
-			//  血透患者检测结果表（T_HD_LIS_REPORT）
-			city.SyncLisReport(orgDb, org.OrgId, org.HospitalId)
-			//  血透患者检验结果指标表（T_HD_LIS_INDICATORS）
-			city.SyncLisIndicators(orgDb, org.OrgId, org.HospitalId)
+			// //  透析并发症记录表（T_HD_COMPLICATION）
+			// city.SyncComplication(orgDb, org.OrgId, org.HospitalId)
+			// //  血透患者检测结果表（T_HD_LIS_REPORT）
+			// city.SyncLisReport(orgDb, org.OrgId, org.HospitalId)
+			// //  血透患者检验结果指标表（T_HD_LIS_INDICATORS）
+			// city.SyncLisIndicators(orgDb, org.OrgId, org.HospitalId)
 
 			// 第四步：关闭数据库连接
 			service.CloseDB(orgDb)

service/city/auto_create_week_schedules_service.go

 	}
 
 	//同步患者
-	patients, _ := service.FindOrgPatientInfectious(org_id, sync_time, time.Now().Unix())
+	patients, _ := service.FindOrgPatientDataOne(org_id)
 	var infectionList []*sz.TempHdInfection
 	for _, patient := range patients {
-		if len(patient.InfectiousDiseases) > 0 {
-			infection := &sz.TempHdInfection{
-				Sn : strconv.FormatInt(patient.ID,10),
-				HospitalId: hospital_id,
-				PatientNk:  strconv.FormatInt(patient.ID, 10),
-				Hbv: 0,
-				Hcv: 0,
-				Rpr: 0,
-				Hiv: 0,
-				Hbsag:	9,
-				Hbsab: 9,
-				Hbeag: 9,
-				Hbeab: 9,
-				Hbcab: 9,
-				CheckDate: time.Unix(patient.CreatedTime, 0),
-				DoctorId: strconv.FormatInt(patient.RegistrarsId,10),
-				CreateTime:     time.Now(),
-				Sjscsj:         time.Now(),
-				Xgbz:           0,
-			}
-			
-			for _ , infectionDiseases := range patient.InfectiousDiseases{
-				if infectionDiseases.DiseaseId == 2 {
-					infection.Hbv = 1
-				}
-				if infectionDiseases.DiseaseId == 3 {
-					infection.Hcv = 1
-				}
-				if infectionDiseases.DiseaseId == 4 {
-					infection.Hiv = 1
-				}
-				if infectionDiseases.DiseaseId == 6 {
-					infection.Rpr = 1
+		//	查询有没有做传染病检查并返回检验检查时间
+		inspections, _ := service.FindOrgInspectionGroupOne(org_id, sync_time, time.Now().Unix(),patient.ID)
+		if len(inspections) > 0 {
+			for _, insp := range inspections {
+				inspection_arr ,_:= service.FindOrgInspectionGroupTwo(org_id,insp.InspectDate,patient.ID)
+				if len(inspection_arr) > 0 {
+					infection := &sz.TempHdInfection{
+						Sn : strconv.FormatInt(patient.ID,10),
+						HospitalId: hospital_id,
+						PatientNk:  strconv.FormatInt(patient.ID, 10),
+						Hbv: 0,
+						Hcv: 0,
+						Rpr: 0,
+						Hiv: 0,
+						Hbsag:	9,
+						Hbsab: 9,
+						Hbeag: 9,
+						Hbeab: 9,
+						Hbcab: 9,
+						CheckDate: time.Unix(patient.CreatedTime, 0),
+						DoctorId: strconv.FormatInt(patient.RegistrarsId,10),
+						CreateTime:     time.Now(),
+						Sjscsj:         time.Now(),
+						Xgbz:           0,
+					}
+
+					
+					for _ , infectionDiseases := range inspection_arr{
+						if infectionDiseases.ItemId == 60 {
+							infection.Hcv = 0 
+							if infectionDiseases.InspectValue == "阳性" {
+								infection.Hcv = 1 
+							}
+						}
+						if infectionDiseases.ItemId == 62 {
+							infection.Hbsag = 0 
+							if infectionDiseases.InspectValue == "阳性" {
+								infection.Hbsag = 1 
+							}
+						}
+
+						if infectionDiseases.ItemId == 63 {
+							infection.Hbsab = 0 
+							if infectionDiseases.InspectValue == "阳性" {
+								infection.Hbsab = 1 
+							}
+						}
+
+						if infectionDiseases.ItemId == 64 {
+							infection.Hbeag = 0 
+							if infectionDiseases.InspectValue == "阳性" {
+								infection.Hbeag = 1 
+							}
+						}
+
+						if infectionDiseases.ItemId == 65 {
+							infection.Hbeab = 0 
+							if infectionDiseases.InspectValue == "阳性" {
+								infection.Hbeab = 1 
+							}
+						}
+
+						if infectionDiseases.ItemId == 66 {
+							infection.Hbcab = 0 
+							if infectionDiseases.InspectValue == "阳性" {
+								infection.Hbcab = 1 
+							}
+						}
+
+						if infectionDiseases.ItemId == 111 {
+							infection.Hiv = 0 
+							if infectionDiseases.InspectValue == "阳性" {
+								infection.Hiv = 1 
+							}
+						}
+
+						if infectionDiseases.ItemId == 112 {
+							infection.Rpr = 0 
+							if infectionDiseases.InspectValue == "阳性" {
+								infection.Rpr = 1 
+							}
+						}
+
+						if infectionDiseases.ItemId == 178 {
+							infection.Hbv = 0 
+							if infectionDiseases.InspectValue == "阳性" {
+								infection.Hbv = 1 
+							}
+						}
+
+						if infectionDiseases.ItemId == 179 {
+							infection.Hcv = 0 
+							if infectionDiseases.InspectValue == "阳性" {
+								infection.Hcv = 1 
+							}
+						}
+						
+					}
+					infectionList = append(infectionList,infection)
 				}
 			}
-			infectionList = append(infectionList,infection)
 		}
 	}
 

service/city_data_uoload_service.go

 	return
 }
 
+func FindOrgPatientDataOne(org_id int64) (patient []*models.Patients, err error) {
+	db := readDb.Model(&models.Patients{}).Where("status = 1 AND user_org_id = ?", org_id)
+	err = db.Find(&patient).Error
+	return
+}
+
 func FindOrgPatientInfectious(org_id int64, lastUploadTime int64, nowTime int64) (patient []*models.Patients, err error) {
-	db := readDb.Model(&models.Patients{}).Where("status = 1 AND user_org_id = ? AND lapseto = 2 ", org_id).Preload("InfectiousDiseases", "status = 1")
+	db := readDb.Model(&models.Patients{}).Where("status = 1 AND user_org_id = ? AND lapseto = 2 ", org_id)
 	db = db.Where("created_time >= ? AND created_time <= ?", lastUploadTime, nowTime)
 	err = db.Find(&patient).Error
 	return
 	return
 }
 
+// 传染病查询
+func FindOrgInspectionGroupOne(org_id int64,  lastUploadTime int64, nowTime int64,patient_id int64) (inspection []*models.XtInspection, err error) {
+	db := readDb.Model(&models.XtInspection{}).Where("status = 1 AND org_id = ? and project_id = 14 and patient_id = ?", org_id,patient_id)
+	db = db.Where("created_time >= ? AND created_time <= ?", lastUploadTime, nowTime).Group("inspect_date")
+	err = db.Find(&inspection).Error
+	return
+}
+
+// 传染病查询
+func FindOrgInspectionGroupTwo(org_id int64, inspect_date int64,patient_id int64) (inspection []*models.XtInspection, err error) {
+	db := readDb.Model(&models.XtInspection{}).Where("status = 1 AND org_id = ? and project_id = 14 and patient_id = ? and inspect_date = ?", org_id,patient_id,inspect_date)
+	err = db.Find(&inspection).Error
+	return
+}
+
 func FindOrgInspectionReference(org_id int64,  lastUploadTime int64, nowTime int64) (inspection []*models.XtInspection, err error) {
 	db := readDb.Model(&models.XtInspection{}).Where("status = 1 AND org_id = ? ", org_id).Preload("XtInspectionReference", "status = 1")
 	db = db.Where("created_time >= ? AND created_time <= ?", lastUploadTime, nowTime)