1111

main.go

@@ -28,9 +28,10 @@ func main() {
 	//city.SyncToSzblgpYxxxzx()
 	// 创建一个新的调度器
 
-
-
-	city.SyncToSzblpg()
+	//city.SyncToSzbl()
+	//city.SyncToSzblbr()
+	//city.SyncToSzblpg()
+	//city.SyncToSzblYxxxzx()
 
 
 	beego.Run()

models/src_data.go

@@ -503,8 +503,8 @@ type AssessmentAfterDislysis struct {
 	// DialysisIntakesTransfusion      int64   `gorm:"column:dialysis_intakes_transfusion" json:"dialysis_intakes_transfusion"`
 	// DialysisIntakesBloodTransfusion int64   `gorm:"column:dialysis_intakes_blood_transfusion" json:"dialysis_intakes_blood_transfusion"`
 	// DialysisIntakesWashpipe         int64   `gorm:"column:dialysis_intakes_washpipe" json:"dialysis_intakes_washpipe"`
-	Ktv                          string  `gorm:"column:ktv" json:"ktv"`
-	Urr                          string  `gorm:"column:urr" json:"urr"`
+	Ktv                          float64  `gorm:"column:ktv" json:"ktv"`
+	Urr                          float64  `gorm:"column:urr" json:"urr"`
 	Status                       int64   `gorm:"column:status" json:"status"`
 	CreatedTime                  int64   `gorm:"column:created_time" json:"created_time"`
 	UpdatedTime                  int64   `gorm:"column:updated_time" json:"updated_time"`

models/sz/target_data.go

@@ -600,8 +600,8 @@ type TempHdDialysis struct {
 	AfterWeight           float64   `gorm:"column:after_weight" json:"after_weight" form:"after_weight"`
 	AccessId              string    `gorm:"column:access_id" json:"access_id" form:"access_id"`
 	DialyzerId            string    `gorm:"column:dialyzer_id" json:"dialyzer_id" form:"dialyzer_id"`
-	Ktv                   string    `gorm:"column:ktv" json:"ktv" form:"ktv"`
-	Urr                   string    `gorm:"column:urr" json:"urr" form:"urr"`
+	Ktv                   float64    `gorm:"column:ktv" json:"ktv" form:"ktv"`
+	Urr                   float64    `gorm:"column:urr" json:"urr" form:"urr"`
 	BeforeBun             float64   `gorm:"column:before_bun" json:"before_bun" form:"before_bun"`
 	AfterBun              float64   `gorm:"column:after_bun" json:"after_bun" form:"after_bun"`
 	ChargeDoctorId        string    `gorm:"column:charge_doctor_id" json:"charge_doctor_id" form:"charge_doctor_id"`
@@ -615,7 +615,7 @@ type TempHdDialysis struct {
 	CreateTime            time.Time `gorm:"column:create_time" json:"create_time" form:"create_time"`
 	Sjscsj                time.Time `gorm:"column:sjscsj" json:"sjscsj" form:"sjscsj"`
 	Mj                    string    `gorm:"column:mj" json:"mj" form:"mj"`
-	Xgbz                  int64     `gorm:"column:xgbz" json:"xgbz" form:"xgbz"`
+	Xgbz                  string     `gorm:"column:xgbz" json:"xgbz" form:"xgbz"`
 	Ylyl1                 string    `gorm:"column:ylyl1" json:"ylyl1" form:"ylyl1"`
 	Ylyl2                 string    `gorm:"column:ylyl2" json:"ylyl2" form:"ylyl2"`
 }

service/city/auto_create_week_schedules_service.go

@@ -518,6 +518,7 @@ func SyncToSzblYxxxzxtmp() {
 
 	return
 }
+
 func SyncToSzblbr() {
 	org := &sz.DataUploadConfig{
 		OrgId:          10278,
@@ -634,9 +635,243 @@ func SyncToSzblbr() {
 
 	return
 }
+func SyncToSzblpg() {
+	org := &sz.DataUploadConfig{
+		OrgId:          10610,
+		ProvinceId:     19,
+		CityId:         291,
+		DepartmentName: "深圳百霖鹏港血液透析中心",
+		HospitalId:     "MACWP1CB3",
+		InstType:       1,
+		DbHost:         "127.0.0.1",
+		DbPort:         "1433",
+		DbPass:         "1Q2W3e4r!@#$",
+		DbUser:         "adapter_new",
+		DbName:         "adapter_new",
+	}
 
+	// for _, org := range configs {
+	// 第二步：跟进配置，创建数据库连接
+	if len(org.DbHost) > 0 && len(org.DbUser) > 0 && len(org.DbPort) > 0 && len(org.DbPass) > 0 && len(org.DbName) > 0 {
+		orgDb, err := service.CreateSqlServiceDB(org.DbHost, org.DbPort, org.DbUser, org.DbPass, org.DbName)
+		if err != nil {
+			utils.ErrorLog("创建数据库连接失败:%v", err)
+			return
+		}
 
-func SyncToSzblpg() {
+		// 第三步：开始同步数据
+		//// 同步医院信息  t_hd_hospital
+		SyncHospital(orgDb, org.OrgId, org.HospitalId, org.InstType, org.DepartmentName)
+		//// 同步员工 t_hd_staff
+		SyncStaff(orgDb, org.OrgId, org.HospitalId)
+		//// 布局表（T_HD_LAYOUT）
+		SyncLayout(orgDb, org.OrgId, org.HospitalId)
+		//// 同步设备 t_hd_dm
+		SyncDM(orgDb, org.OrgId, org.HospitalId)
+		//// 同步水处理器  t_hd_wm
+		SyncWMS(orgDb, org.OrgId, org.HospitalId)
+		//// 同步维修 t_hd_maintain
+		SyncMachineRepair(orgDb, org.OrgId, org.HospitalId)
+		//// 同步设备消毒方法表（T_HD_DISINFECT_METHOD
+		SyncDisinfectMethod(orgDb, org.OrgId, org.HospitalId)
+		//// 同步其它设备信息表（T_HD_OTHER_MACHINE）
+		SyncOtherMachine(orgDb, org.OrgId, org.HospitalId)
+		//// 同步透析机消毒检测记录表（T_HD_DM_DISINFECT）
+		SyncDmDisinfect(orgDb, org.OrgId, org.HospitalId)
+		//// 透析机透析液细菌培养检测记录表(t_hd_dm_dialysate_bc)
+		SyncLisCulture(orgDb, org.OrgId, org.HospitalId)
+		//// 透析机透析液内毒素检测记录表（T_HD_DM_DIALYSATE_EN)
+		SyncDialysate(orgDb, org.OrgId, org.HospitalId)
+		//// 水处理机消毒记录表（T_HD_WM_DISINFECT）
+		SyncWmDisinfect(orgDb, org.OrgId, org.HospitalId)
+		////透析用水PH值检测表(T_HD_WATER_PH)
+		SynLisWaterPh(orgDb, org.OrgId, org.HospitalId)
+		////透析用水细菌培养检测表(T_HD_WATER_BC)
+		SyncLisWaterBc(orgDb, org.OrgId, org.HospitalId)
+		////透析用水内毒素检测表(T_HD_WATER_EN)
+		SyncLisWaterEn(orgDb, org.OrgId, org.HospitalId)
+		////透析用水有毒化学物检测表(T_HD_WATER_NC)
+		SynLisWaterNc(orgDb, org.OrgId, org.HospitalId)
+		//透析用水水硬度检测表(T_HD_WATER_WH)
+		SynListHadWater(orgDb, org.OrgId, org.HospitalId)
+		//透析用水游离氯检测表(T_HD_WATER_FC)
+		SyncLisWaterFc(orgDb, org.OrgId, org.HospitalId)
+		//透析用水电解质检测表（T_HD_WATER_EL）
+		SyncLisWaterEl(orgDb, org.OrgId, org.HospitalId)
+		//透析用水微量元素检测表（T_HD_WATER_TE）
+		SyncLisWaterTe(orgDb, org.OrgId, org.HospitalId)
+		//透析室空气消毒记录表(T_HD_AIR_DISINFECT)
+		SyncLisAirDetection(orgDb, org.OrgId, org.HospitalId)
+		//物表消毒记录表(T_HD_SURFACE_DISINFECT)
+		SyncLisBodyDetection(orgDb, org.OrgId, org.HospitalId)
+		// 同步血透患者基本信息表（T_HD_PATIENT）
+		SyncPatient(orgDb, org.OrgId, org.HospitalId)
+		// 同步患者退出信息表（T_HD_PATIENT_QUIT）
+		SyncPatientOut(orgDb, org.OrgId, org.HospitalId)
+		// 同步处方 t_hd_ps
+		SyncPs(orgDb, org.OrgId, org.HospitalId)
+		// 同步处方药品 t_hd_ps
+		SyncPsMedicine(orgDb, org.OrgId, org.HospitalId)
+		// 患者诊断信息表（T_HD_DIAGNOSIS）
+		SyncDiagnosis(orgDb, org.OrgId, org.HospitalId)
+		// 患者通路信息表（T_HD_ACCESS）
+		SyncAccess(orgDb, org.OrgId, org.HospitalId)
+		//导管感染记录表(T_HD_CI)
+		SynListHdCi(orgDb, org.OrgId, org.HospitalId)
+		//导管感染转归记录表(T_HD_CI_OUTCOME)
+		SynLisHdCiOutCome(orgDb, org.OrgId, org.HospitalId)
+		// city.UpdatePatient(orgDb, org.OrgId, org.HospitalId)
+		// 患者传染病检查记录表（T_HD_INFECTION
+		SyncInfection(orgDb, org.OrgId, org.HospitalId)
+		// 同步排班  t_hd_shift
+		SyncShift(orgDb, org.OrgId, org.HospitalId)
+		// 同步透析医嘱表（T_HD_DOCTORS_ADVICE）
+		SyncDoctorAdvice(orgDb, org.OrgId, org.HospitalId)
+		// 同步患者透析记录 t_hd_dialysis
+		SyncDialysis(orgDb, org.OrgId, org.HospitalId)
+		// 同步透中信息 t_hd_middle
+		SyncMiddle(orgDb, org.OrgId, org.HospitalId)
+		// 透析并发症记录表（T_HD_COMPLICATION）
+		SyncComplication(orgDb, org.OrgId, org.HospitalId)
+		// 透析床位表（T_HD_SICKBED）
+		SyncSickbed2(orgDb, org.OrgId, org.HospitalId)
+		// 同步透析床位分区 t_hd_division
+		SyncDivision(orgDb, org.OrgId, org.HospitalId)
+		// 血透患者检测结果表（T_HD_LIS_REPORT）
+		SyncLisReport(orgDb, org.OrgId, org.HospitalId)
+		// 血透患者检验结果指标表（T_HD_LIS_INDICATORS）
+		SyncLisIndicators(orgDb, org.OrgId, org.HospitalId)
+
+		SyncLisIndicatorsBc(orgDb, org.OrgId, org.HospitalId)
+		SyncLisReportBc(orgDb, org.OrgId, org.HospitalId)
+		// 第四步：关闭数据库连接
+		service.CloseDB(orgDb)
+	}
+	// }
+
+	return
+}
+
+
+//func SyncToSzblpg4() {
+//	org := &sz.DataUploadConfig{
+//		OrgId:          10610,
+//		ProvinceId:     19,
+//		CityId:         291,
+//		DepartmentName: "深圳百霖鹏港血液透析中心",
+//		HospitalId:     "MACWP1CB3",
+//		InstType:       1,
+//		DbHost:         "127.0.0.1",
+//		DbPort:         "1433",
+//		DbPass:         "1Q2W3e4r!@#$",
+//		DbUser:         "adapter_new",
+//		DbName:         "adapter_new",
+//	}
+//
+//	// for _, org := range configs {
+//	// 第二步：跟进配置，创建数据库连接
+//	if len(org.DbHost) > 0 && len(org.DbUser) > 0 && len(org.DbPort) > 0 && len(org.DbPass) > 0 && len(org.DbName) > 0 {
+//		orgDb, err := service.CreateSqlServiceDB(org.DbHost, org.DbPort, org.DbUser, org.DbPass, org.DbName)
+//		if err != nil {
+//			utils.ErrorLog("创建数据库连接失败:%v", err)
+//			return
+//		}
+//
+//		//// 第三步：开始同步数据
+//		////// 同步医院信息  t_hd_hospital
+//		//SyncHospital(orgDb, org.OrgId, org.HospitalId, org.InstType, org.DepartmentName)
+//		////// 同步员工 t_hd_staff
+//		//SyncStaff(orgDb, org.OrgId, org.HospitalId)
+//		////// 布局表（T_HD_LAYOUT）
+//		//SyncLayout(orgDb, org.OrgId, org.HospitalId)
+//		////// 同步设备 t_hd_dm
+//		//SyncDM(orgDb, org.OrgId, org.HospitalId)
+//		////// 同步水处理器  t_hd_wm
+//		//SyncWMS(orgDb, org.OrgId, org.HospitalId)
+//		////// 同步维修 t_hd_maintain
+//		//SyncMachineRepair(orgDb, org.OrgId, org.HospitalId)
+//		////// 同步设备消毒方法表（T_HD_DISINFECT_METHOD
+//		//SyncDisinfectMethod(orgDb, org.OrgId, org.HospitalId)
+//		////// 同步其它设备信息表（T_HD_OTHER_MACHINE）
+//		//SyncOtherMachine(orgDb, org.OrgId, org.HospitalId)
+//		////// 同步透析机消毒检测记录表（T_HD_DM_DISINFECT）
+//		//SyncDmDisinfect(orgDb, org.OrgId, org.HospitalId)
+//		////// 透析机透析液细菌培养检测记录表(t_hd_dm_dialysate_bc)
+//		//SyncLisCulture(orgDb, org.OrgId, org.HospitalId)
+//		////// 透析机透析液内毒素检测记录表（T_HD_DM_DIALYSATE_EN)
+//		//SyncDialysate(orgDb, org.OrgId, org.HospitalId)
+//		////// 水处理机消毒记录表（T_HD_WM_DISINFECT）
+//		//SyncWmDisinfect(orgDb, org.OrgId, org.HospitalId)
+//		//////透析用水PH值检测表(T_HD_WATER_PH)
+//		//SynLisWaterPh(orgDb, org.OrgId, org.HospitalId)
+//		//////透析用水细菌培养检测表(T_HD_WATER_BC)
+//		//SyncLisWaterBc(orgDb, org.OrgId, org.HospitalId)
+//		//////透析用水内毒素检测表(T_HD_WATER_EN)
+//		//SyncLisWaterEn(orgDb, org.OrgId, org.HospitalId)
+//		//////透析用水有毒化学物检测表(T_HD_WATER_NC)
+//		//SynLisWaterNc(orgDb, org.OrgId, org.HospitalId)
+//		////透析用水水硬度检测表(T_HD_WATER_WH)
+//		//SynListHadWater(orgDb, org.OrgId, org.HospitalId)
+//		////透析用水游离氯检测表(T_HD_WATER_FC)
+//		//SyncLisWaterFc(orgDb, org.OrgId, org.HospitalId)
+//		////透析用水电解质检测表（T_HD_WATER_EL）
+//		//SyncLisWaterEl(orgDb, org.OrgId, org.HospitalId)
+//		////透析用水微量元素检测表（T_HD_WATER_TE）
+//		//SyncLisWaterTe(orgDb, org.OrgId, org.HospitalId)
+//		////透析室空气消毒记录表(T_HD_AIR_DISINFECT)
+//		//SyncLisAirDetection(orgDb, org.OrgId, org.HospitalId)
+//		////物表消毒记录表(T_HD_SURFACE_DISINFECT)
+//		//SyncLisBodyDetection(orgDb, org.OrgId, org.HospitalId)
+//		//// 同步血透患者基本信息表（T_HD_PATIENT）
+//		//SyncPatient(orgDb, org.OrgId, org.HospitalId)
+//		//// 同步患者退出信息表（T_HD_PATIENT_QUIT）
+//		//SyncPatientOut(orgDb, org.OrgId, org.HospitalId)
+//		//// 同步处方 t_hd_ps
+//		//SyncPs(orgDb, org.OrgId, org.HospitalId)
+//		// 同步处方药品 t_hd_ps
+//		//SyncPsMedicine(orgDb, org.OrgId, org.HospitalId)
+//		//// 患者诊断信息表（T_HD_DIAGNOSIS）
+//		//SyncDiagnosis(orgDb, org.OrgId, org.HospitalId)
+//		//// 患者通路信息表（T_HD_ACCESS）
+//		//SyncAccess(orgDb, org.OrgId, org.HospitalId)
+//		////导管感染记录表(T_HD_CI)
+//		//SynListHdCi(orgDb, org.OrgId, org.HospitalId)
+//		////导管感染转归记录表(T_HD_CI_OUTCOME)
+//		//SynLisHdCiOutCome(orgDb, org.OrgId, org.HospitalId)
+//		//// city.UpdatePatient(orgDb, org.OrgId, org.HospitalId)
+//		//// 患者传染病检查记录表（T_HD_INFECTION
+//		SyncInfection(orgDb, org.OrgId, org.HospitalId)
+//		//// 同步排班  t_hd_shift
+//		//SyncShift(orgDb, org.OrgId, org.HospitalId)
+//		//// 同步透析医嘱表（T_HD_DOCTORS_ADVICE）
+//		//SyncDoctorAdvice(orgDb, org.OrgId, org.HospitalId)
+//		//// 同步患者透析记录 t_hd_dialysis
+//		//SyncDialysis(orgDb, org.OrgId, org.HospitalId)
+//		//// 同步透中信息 t_hd_middle
+//		//SyncMiddle(orgDb, org.OrgId, org.HospitalId)
+//		//// 透析并发症记录表（T_HD_COMPLICATION）
+//		//SyncComplication(orgDb, org.OrgId, org.HospitalId)
+//		//// 透析床位表（T_HD_SICKBED）
+//		//SyncSickbed2(orgDb, org.OrgId, org.HospitalId)
+//		//// 同步透析床位分区 t_hd_division
+//		//SyncDivision(orgDb, org.OrgId, org.HospitalId)
+//		//// 血透患者检测结果表（T_HD_LIS_REPORT）
+//		//SyncLisReport(orgDb, org.OrgId, org.HospitalId)
+//		////// 血透患者检验结果指标表（T_HD_LIS_INDICATORS）
+//		//SyncLisIndicators(orgDb, org.OrgId, org.HospitalId)
+//		//
+//		//SyncLisIndicatorsBc(orgDb, org.OrgId, org.HospitalId)
+//		//SyncLisReportBc(orgDb, org.OrgId, org.HospitalId)
+//		// 第四步：关闭数据库连接
+//		service.CloseDB(orgDb)
+//	}
+//	// }
+//
+//	return
+//}
+
+
+func SyncToSzblpg123() {
 	org := &sz.DataUploadConfig{
 		OrgId:          10610,
 		ProvinceId:     19,
@@ -752,6 +987,7 @@ func SyncToSzblpg() {
 
 	return
 }
+
 func SyncToSzblgpYxxxzx() {
 	org := &sz.DataUploadConfig{
 		OrgId:          10610,
@@ -2992,7 +3228,7 @@ func SyncDialysis(rdb *gorm.DB, org_id int64, hospital_id string) {
 	if syncLastInfo.ID > 0 {
 		sync_time = syncLastInfo.SyncTime
 	} else {
-		sync_time = 1577808000
+		sync_time = 0
 	}
 
 	var tempDialysis []*sz.TempHdDialysis
@@ -3031,7 +3267,7 @@ func SyncDialysis(rdb *gorm.DB, org_id int64, hospital_id string) {
 			EndTime:               time.Unix(item.EndTime, 0),
 			CreateTime:            time.Unix(item.CreatedTime, 0),
 			Sjscsj:                time.Now(),
-			Xgbz:                  0,
+			Xgbz:                  "0",
 		}
 
 		if item.AssessmentAfterDislysis.ActualUltrafiltration < 10 {
@@ -3875,6 +4111,107 @@ func SyncInfection(rdb *gorm.DB, org_id int64, hospital_id string) {
 			}
 		}
 
+		if org_id == 10610 {
+			// 深圳百霖贝尔
+			inspections, _ := service.FindOrgInspectionGroupSzblpg(org_id, sync_time, time.Now().Unix(), patient.ID)
+			if len(inspections) > 0 {
+				for _, insp := range inspections {
+					inspection_arr, _ := service.FindOrgInspectionGroupSzblpgTwo(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:        9,
+							Hcv:        9,
+							Rpr:        9,
+							Hiv:        9,
+							Hbsag:      9,
+							Hbsab:      9,
+							Hbeag:      9,
+							Hbeab:      9,
+							Hbcab:      9,
+							CheckDate:  time.Unix(insp.InspectDate, 0),
+							DoctorId:   "4317",
+							CreateTime: time.Now(),
+							Sjscsj:     time.Now(),
+							Xgbz:       0,
+						}
+
+						for _, infectionDiseases := range inspection_arr {
+							infection.Sn = strconv.FormatInt(infectionDiseases.ID, 10)
+							infection.CheckDate = time.Unix(infectionDiseases.InspectDate, 0)
+							// 乙肝
+							if infectionDiseases.ItemId == 101380410 {
+								infection.Hbv = 0
+								if strings.Contains(infectionDiseases.InspectValue, "阳性") {
+									infection.Hbv = 1
+								}
+							}
+							// 丙肝
+							if infectionDiseases.ItemId == 101380405 ||  infectionDiseases.ItemId == 101380402 {
+								infection.Hcv = 0
+								if strings.Contains(infectionDiseases.InspectValue, "阳性") {
+									infection.Hcv = 1
+								}
+							}
+							// 梅毒
+							if infectionDiseases.ItemId == 101380401  {
+								infection.Rpr = 0
+								if strings.Contains(infectionDiseases.InspectValue, "阳性") {
+									infection.Rpr = 1
+								}
+							}
+							// 艾滋病
+							if infectionDiseases.ItemId == 101380404  {
+								infection.Rpr = 0
+								if strings.Contains(infectionDiseases.InspectValue, "阳性") {
+									infection.Rpr = 1
+								}
+							}
+							// HBsAg 乙型肝炎表面抗原;
+							if infectionDiseases.ItemId == 101380410 {
+								infection.Hbsag = 0
+								if strings.Contains(infectionDiseases.InspectValue, "阳性") {
+									infection.Hbsag = 1
+								}
+							}
+							// HBsAb  乙型肝炎表面抗体;
+							if infectionDiseases.ItemId == 101380409  {
+								infection.Hbsab = 0
+								if strings.Contains(infectionDiseases.InspectValue, "阳性") {
+									infection.Hbsab = 1
+								}
+							}
+							// HBeAg 乙肝病毒e抗原;
+							if infectionDiseases.ItemId == 101380408 {
+								infection.Hbeag = 0
+								if strings.Contains(infectionDiseases.InspectValue, "阳性") {
+									infection.Hbeag = 1
+								}
+							}
+							// HBeAb 乙型肝炎E抗体;
+							if infectionDiseases.ItemId == 101380407 {
+								infection.Hbeab = 0
+								if strings.Contains(infectionDiseases.InspectValue, "阳性") {
+									infection.Hbeab = 1
+								}
+							}
+							// HBcAb  乙肝核心抗体;
+							if infectionDiseases.ItemId == 101380406 {
+								infection.Hbcab = 0
+								if strings.Contains(infectionDiseases.InspectValue, "阳性") {
+									infection.Hbcab = 1
+								}
+							}
+						}
+						infectionList = append(infectionList, infection)
+					}
+				}
+			}
+		}
+
+
 	}
 
 	if len(infectionList) > 0 {
@@ -4605,7 +4942,7 @@ func SyncComplication(rdb *gorm.DB, org_id int64, hospital_id string) {
 
 func SyncLisReportBc(rdb *gorm.DB, org_id int64, hospital_id string) {
 	var sync_time int64
-	sync_time = 1704038400
+	sync_time = 1735660800
 	inspections, _ := service.FindOrgInspection(org_id, sync_time, time.Now().Unix())
 	var lisReportList []*sz.TempHdLisReport
 	tempFlag := 0
@@ -4794,7 +5131,7 @@ func SyncLisIndicatorsBcUpdate(rdb *gorm.DB, org_id int64, hospital_id string) {
 
 func SyncLisIndicatorsBc(rdb *gorm.DB, org_id int64, hospital_id string) {
 	var sync_time int64
-	sync_time = 1704038400
+	sync_time = 1735660800
 
 	//同步监测记录
 	inspections, _ := service.FindOrgInspectionTwo(org_id, sync_time, time.Now().Unix())

service/city_data_uoload_service.go

@@ -402,6 +402,13 @@ func FindOrgInspectionGroupSzblbr(org_id int64, lastUploadTime int64, nowTime in
 	return
 }
 
+func FindOrgInspectionGroupSzblpg(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 in (1013804)  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 FindOrgInspectionGroupSzblTwo(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 in (1013800,1013870)  and patient_id = ? and inspect_date = ?", org_id, patient_id, inspect_date)
@@ -416,6 +423,13 @@ func FindOrgInspectionGroupSzblbrTwo(org_id int64, inspect_date int64, patient_i
 	return
 }
 
+// 传染病查询
+func FindOrgInspectionGroupSzblpgTwo(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 in (1013804) and patient_id = ? and inspect_date = ?", org_id, patient_id, 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)