Merge branch '20211122' of http://git.shengws.com/csx/XT_New into 20211122

conf/app.conf

@@ -124,7 +124,7 @@ writepatientname = sgj_cdm
 redishost = kuyicloud.redis.rds.aliyuncs.com
 redisport = 6379
 redispasswrod = 1Q2W3e4r!@#$
-redisdb = 8
+redisdb = 1
 
 
 

controllers/dialysis_api_controller.go

@@ -1571,19 +1571,19 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 			dewater_amount = 0
 		}
 		// 计算透析处方的相关超滤量
-		schedual, _ := service.MobileGetSchedualDetail(adminUserInfo.CurrentOrgId, patient, recordDate.Unix())
+		schedual, _ := service.MobileGetSchedualDetailSix(adminUserInfo.CurrentOrgId, patient, recordDate.Unix())
 		var lastDialysisPrescribe *models.DialysisPrescription
 		var dialysisSolution *models.DialysisSolution
 		var dialysisPrescribe *models.DialysisPrescription
 		var mode_id int64
 		if schedual != nil {
-			dialysisPrescribe, _ = service.MobileGetDialysisPrescribeByModeId(adminUserInfo.CurrentOrgId, patient, recordDate.Unix(), schedual.ModeId)
+			dialysisPrescribe, _ = service.MobileGetDialysisPrescribeByModeIdSix(adminUserInfo.CurrentOrgId, patient, recordDate.Unix(), schedual.ModeId)
 			if dialysisPrescribe == nil {
 				dialysisPrescribe, _ = service.MobileGetDialysisPrescribe(adminUserInfo.CurrentOrgId, patient, recordDate.Unix())
 			}
-			lastDialysisPrescribe, _ = service.MobileGetLastDialysisPrescribeByModeId(adminUserInfo.CurrentOrgId, patient, schedual.ModeId)
+			lastDialysisPrescribe, _ = service.MobileGetLastDialysisPrescribeByModeIdSix(adminUserInfo.CurrentOrgId, patient, schedual.ModeId)
 			// 获取透析模版
-			dialysisSolution, _ = service.MobileGetDialysisSolutionByModeId(adminUserInfo.CurrentOrgId, patient, schedual.ModeId)
+			dialysisSolution, _ = service.MobileGetDialysisSolutionByModeIdSix(adminUserInfo.CurrentOrgId, patient, schedual.ModeId)
 			mode_id = schedual.ModeId
 		} else {
 			//lastDialysisPrescribe, _ = service.MobileGetLastDialysisPrescribe(adminUserInfo.Org.Id, id,schedual.ModeId)
@@ -1599,7 +1599,8 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 				mode_id = 0
 			}
 		}
-
+		fmt.Println("dialysisPrescribe------------------------------------", dialysisPrescribe)
+		fmt.Println("dialysisSolution------------------------------------", dialysisSolution)
 		// 插入透析处方
 		if dialysisPrescribe == nil && dialysisSolution != nil {
 			var newprescribe models.DialysisPrescription
@@ -1705,6 +1706,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 				newprescribe.DewaterAmount = dewater_amount
 				newprescribe.TargetUltrafiltration = dewater_amount
 				newprescribe.Status = 1
+
 				err := service.AddSigleRecord(&newprescribe)
 				if err != nil {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
@@ -1808,6 +1810,10 @@ func (c *DialysisApiController) PostTreatmentSummary() {
 		err := service.AddSigleSummaryRecord(&treatmentSummary)
 		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":treatment_summary"
 		redis := service.RedisClient()
+		keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":treatment_summarys_list_all"
+		redis.Set(keyOne, "", time.Second)
+		keyThree := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
+		redis.Set(keyThree, "", time.Second)
 		defer redis.Close()
 		//清空key 值
 		redis.Set(key, "", time.Second)
@@ -1889,96 +1895,6 @@ func (c *DialysisApiController) GetDialysisWatch() {
 	adminUserInfo := c.GetAdminUserInfo()
 	if len(keywords) > 0 {
 		dialysisSchedule, err, total := service.GetDialysisWatchByKeyword(adminUserInfo.CurrentOrgId, keywords, schedulType, partitionType, page, limit)
-
-		//获取所有床位号
-		numberList, _ := service.GetAllDeviceNumberByList(adminUserInfo.CurrentOrgId)
-
-		//获取所有分区
-		//	zoneList, _ := service.GetAllZoneByList(adminUserInfo.CurrentOrgId)
-		//获取透析处方
-		prescriptions, _ := service.GetAllPrescriptionByListTwo(adminUserInfo.CurrentOrgId, startTime)
-		//获取透前评估
-		assessmentBefores, _ := service.GetAllAssessmentBeforesByListThree(adminUserInfo.CurrentOrgId, startTime)
-		//获取上机
-		dialysisOrders, _ := service.GetAllDialysisOrdersByListThree(adminUserInfo.CurrentOrgId, startTime)
-		//获取透后
-		AssessmentAfterDislysis, _ := service.GetAllAssessmentAfterDislysisByListThree(adminUserInfo.CurrentOrgId, startTime)
-
-		//获取透后监测
-		monitorlist, _ := service.GetAllMonitorListThree(adminUserInfo.CurrentOrgId, startTime)
-
-		//获取所有的患者
-		patients, _ := service.GetAllPatientListByListThree(adminUserInfo.CurrentOrgId)
-
-		//获取所有透析模式
-		treatments, _ := service.GetAllTreatModeByList(adminUserInfo.CurrentOrgId)
-
-		for key, scheduals := range dialysisSchedule {
-			// 获取患者信息
-			for _, patient := range patients {
-				if scheduals.PatientId == patient.ID {
-					dialysisSchedule[key].MonitorPatients = patient
-					break
-				}
-			}
-			// 床位信息
-			for _, device := range numberList {
-				if scheduals.BedId == device.ID {
-					dialysisSchedule[key].DeviceNumber = device
-					break
-				}
-			}
-
-			// 医嘱信息
-			for _, prescription := range prescriptions {
-				if scheduals.PatientId == prescription.PatientId {
-					dialysisSchedule[key].Prescription = prescription
-					break
-				}
-			}
-
-			// 透前评估
-			for _, assessmentBefore := range assessmentBefores {
-				if scheduals.PatientId == assessmentBefore.PatientId {
-					dialysisSchedule[key].AssessmentBeforeDislysis = assessmentBefore
-					break
-				}
-			}
-
-			// 透析上下机
-			for _, dialysisOrder := range dialysisOrders {
-				if scheduals.PatientId == dialysisOrder.PatientId {
-					dialysisSchedule[key].DialysisOrder = dialysisOrder
-					break
-				}
-			}
-
-			records := make([]*models.MonitoringRecord, 0)
-			// 透析监测
-			for _, it := range monitorlist {
-				records := append(records, it)
-				if scheduals.PatientId == it.PatientId {
-					dialysisSchedule[key].MonitoringRecord = records
-				}
-			}
-
-			// 透后评估
-			for _, afterDislysis := range AssessmentAfterDislysis {
-				if scheduals.PatientId == afterDislysis.PatientId {
-					dialysisSchedule[key].AssessmentAfterDislysis = afterDislysis
-					break
-				}
-			}
-
-			//透析模式
-			for _, treatment := range treatments {
-				if scheduals.ModeId == treatment.ID {
-					dialysisSchedule[key].TreatmentMode = treatment
-					break
-				}
-			}
-		}
-		//获取所有床位号
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"schedule": dialysisSchedule,
@@ -2001,6 +1917,127 @@ func (c *DialysisApiController) GetDialysisWatch() {
 	}
 }
 
+//func (c *DialysisApiController) GetDialysisWatch() {
+//	page, _ := c.GetInt64("page", 1)
+//	limit, _ := c.GetInt64("limit", 10)
+//	schedulType, _ := c.GetInt64("schedul_type", 0)
+//	startTime, _ := c.GetInt64("schedul_time", 0)
+//	partitionType, _ := c.GetInt64("partition_type", 0)
+//	keywords := c.GetString("keywords")
+//
+//	adminUserInfo := c.GetAdminUserInfo()
+//	if len(keywords) > 0 {
+//		dialysisSchedule, err, total := service.GetDialysisWatchByKeyword(adminUserInfo.CurrentOrgId, keywords, schedulType, partitionType, page, limit)
+//
+//		//获取所有床位号
+//		numberList, _ := service.GetAllDeviceNumberByListSix(adminUserInfo.CurrentOrgId)
+//
+//		//获取透析处方
+//		prescriptions, _ := service.GetAllPrescriptionByListTwo(adminUserInfo.CurrentOrgId, startTime)
+//		//获取透前评估
+//		assessmentBefores, _ := service.GetAllAssessmentBeforesByListThree(adminUserInfo.CurrentOrgId, startTime)
+//		//获取上机
+//		dialysisOrders, _ := service.GetAllDialysisOrdersByListThree(adminUserInfo.CurrentOrgId, startTime)
+//		//获取透后
+//		AssessmentAfterDislysis, _ := service.GetAllAssessmentAfterDislysisByListThree(adminUserInfo.CurrentOrgId, startTime)
+//
+//		//获取透后监测
+//		monitorlist, _ := service.GetAllMonitorListThree(adminUserInfo.CurrentOrgId, startTime)
+//
+//		//获取所有的患者
+//		patients, _ := service.GetAllPatientListByListSix(adminUserInfo.CurrentOrgId,keywords)
+//
+//		//获取所有透析模式
+//		treatments, _ := service.GetAllTreatModeByList(adminUserInfo.CurrentOrgId)
+//
+//		for key, scheduals := range dialysisSchedule {
+//			// 获取患者信息
+//			for _, patient := range patients {
+//				if scheduals.PatientId == patient.ID {
+//					dialysisSchedule[key].MonitorPatients = patient
+//					break
+//				}
+//			}
+//			// 床位信息
+//			for _, device := range numberList {
+//				if scheduals.BedId == device.ID {
+//					dialysisSchedule[key].DeviceNumber = device
+//					break
+//				}
+//			}
+//
+//			// 医嘱信息
+//			for _, prescription := range prescriptions {
+//				if scheduals.PatientId == prescription.PatientId {
+//					dialysisSchedule[key].Prescription = prescription
+//					break
+//				}
+//			}
+//
+//			// 透前评估
+//			for _, assessmentBefore := range assessmentBefores {
+//				if scheduals.PatientId == assessmentBefore.PatientId {
+//					dialysisSchedule[key].AssessmentBeforeDislysis = assessmentBefore
+//					break
+//				}
+//			}
+//
+//			// 透析上下机
+//			for _, dialysisOrder := range dialysisOrders {
+//				if scheduals.PatientId == dialysisOrder.PatientId {
+//					dialysisSchedule[key].DialysisOrder = dialysisOrder
+//					break
+//				}
+//			}
+//
+//			records := make([]*models.MonitoringRecord, 0)
+//			// 透析监测
+//			for _, it := range monitorlist {
+//				records := append(records, it)
+//				if scheduals.PatientId == it.PatientId {
+//					dialysisSchedule[key].MonitoringRecord = records
+//				}
+//			}
+//
+//			// 透后评估
+//			for _, afterDislysis := range AssessmentAfterDislysis {
+//				if scheduals.PatientId == afterDislysis.PatientId {
+//					dialysisSchedule[key].AssessmentAfterDislysis = afterDislysis
+//					break
+//				}
+//			}
+//
+//			//透析模式
+//			for _, treatment := range treatments {
+//				if scheduals.ModeId == treatment.ID {
+//					dialysisSchedule[key].TreatmentMode = treatment
+//					break
+//				}
+//			}
+//		}
+//		//获取所有床位号
+//		if err == nil {
+//			c.ServeSuccessJSON(map[string]interface{}{
+//				"schedule": dialysisSchedule,
+//				"total":    total,
+//			})
+//		} else {
+//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+//		}
+//
+//	} else {
+//		dialysisSchedule, err, total := service.GetDialysisWatch(adminUserInfo.CurrentOrgId, startTime/1000, schedulType, partitionType, page, limit)
+//		if err == nil {
+//			c.ServeSuccessJSON(map[string]interface{}{
+//				"schedule": dialysisSchedule,
+//				"total":    total,
+//			})
+//		} else {
+//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+//		}
+//	}
+//}
+
 func (c *DialysisApiController) GetSchedualPatientsInfo() {
 	patientId, _ := c.GetInt64("id", 0)
 	record_date, _ := c.GetInt64("record_date", 0)
@@ -2769,8 +2806,14 @@ func (c *DialysisApiController) GetDialysisOrder() {
 
 	check, _ := service.FindDoubleCheckById(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 
-	dialysis_count, _ := service.GetDialysisOrderCount(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
-	patientInfo.TotalDialysis = dialysis_count
+	if adminUserInfo.CurrentOrgId != 10101 {
+		dialysis_count, _ := service.GetDialysisOrderCount(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
+		patientInfo.TotalDialysis = dialysis_count
+	}
+	if adminUserInfo.CurrentOrgId == 10101 {
+		dialysis_count, _ := service.GetDialysisOrderCountOne(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
+		patientInfo.TotalDialysis = dialysis_count
+	}
 
 	//相关操作对应的操作人
 	//operators, _ := service.GetAdminUserES(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, operatorIDs)

controllers/dialysis_record_api_controller.go

@@ -88,7 +88,8 @@ func (this *DialysisRecordAPIController) GetSchedules() {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		} else {
 			if len(scheduals) > 0 {
-				patients, _ := service.GetAllPcPatientListByList(orgID)
+
+				patients, _ := service.GetAllPcPatientListByListSeven(orgID)
 
 				dialysisOrders, _ := service.GetAllPcDialysisOrdersByList(orgID, date.Unix())
 
@@ -888,13 +889,17 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 	createErr := service.MobileCreateDialysisOrder(adminUserInfo.CurrentOrgId, patientID, dialysisRecord)
 	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":dialysis_order"
 	redis := service.RedisClient()
-	defer redis.Close()
 	//清空key 值
 	redis.Set(key, "", time.Second)
 
 	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":dialysis_orders_list_all"
 	redis.Set(keyOne, "", time.Second)
 
+	keyTwo := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
+	//清空key 值
+	redis.Set(keyTwo, "", time.Second)
+	defer redis.Close()
+
 	newdialysisRecord, getRecordErr := service.MobileGetDialysisRecord(adminUserInfo.CurrentOrgId, patientID, recordDate.Unix())
 
 	if createErr != nil {
@@ -982,6 +987,14 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 		// 如果当天有插入数据，则不再往透析纪录里插入数据
 		if newdialysisRecord.ID > 0 {
 			err := service.CreateMonitor(&record)
+			key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":monitor_records"
+
+			redis := service.RedisClient()
+			//清空key 值
+			redis.Set(key, "", time.Second)
+			keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":monitor_record_list_all"
+			redis.Set(keyOne, "", time.Second)
+			defer redis.Close()
 
 			if err != nil {
 				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeMonitorCreate)

controllers/doctors_api_controller.go

@@ -53,11 +53,12 @@ func DoctorApiRegistRouters() {
 	beego.Router("/api/patient/gettemplatesummaryprintdetail", &DoctorsApiController{}, "Get:GetTemplateSummaryPrintDetail")
 	beego.Router("/api/patient/updatetemplatesummary", &DoctorsApiController{}, "Post:UpdateTempalteSummary")
 	beego.Router("/api/patient/deletesummary", &DoctorsApiController{}, "Get:DeleteSummary")
-	beego.Router("/api/patient/hospitalsummary", &DoctorsApiController{}, "Get:HospitalSummary")
+	beego.Router("/api/patient/hospitalsummary", &DoctorsApiController{}, "Post:HospitalSummary")
 	beego.Router("/api/patient/gethospitalsummarylist", &DoctorsApiController{}, "Get:GetHospitalSummaryList")
 	beego.Router("/api/patient/gethospitalsummaydetail", &DoctorsApiController{}, "Get:GetHospitalSummaryDetail")
-	beego.Router("/api/patient/updatehospitalsummary", &DoctorsApiController{}, "Get:UpdateHospitalSummary")
+	beego.Router("/api/patient/updatehospitalsummary", &DoctorsApiController{}, "Post:UpdateHospitalSummary")
 	beego.Router("/api/patient/deletehospitalsummary", &DoctorsApiController{}, "Get:DeleteHospitalSummary")
+	beego.Router("/api/patient/getpatientinfo", &DoctorsApiController{}, "Get:GetPatientInfo")
 }
 
 func (c *DoctorsApiController) ScheduleAdvices() {
@@ -1026,7 +1027,7 @@ func (this *DoctorsApiController) GetTemplateSummaryList() {
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 	endTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
-	fmt.Println("hhhhhhhhhhhhhh777777", endTime.Unix())
+
 	list, err := service.GetTemplateSummaryList(patient_id, orgId, startTime.Unix(), endTime.Unix())
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
@@ -1081,90 +1082,50 @@ func (this *DoctorsApiController) UpdateTempalteSummary() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	id := int64(dataBody["id"].(float64))
-	title := dataBody["title"].(string)
-	dryWeight := dataBody["dry_weight"].(string)
+
+	id, _ := this.GetInt64("id")
+	title := this.GetString("title")
+
+	dryWeight := this.GetString("dry_weight")
 	dry_weight, _ := strconv.ParseFloat(dryWeight, 64)
-	dialysis_count := int64(dataBody["dialysis_count"].(float64))
-	hd_count := int64(dataBody["hd_count"].(float64))
-	hdf_count := int64(dataBody["hdf_count"].(float64))
-	hp_count := int64(dataBody["hp_count"].(float64))
-	other_count := int64(dataBody["other_count"].(float64))
-	dialzer_apparatus := dataBody["dialzer_apparatus"].(string)
-	perfusion_apparatus := dataBody["perfusion_apparatus"].(string)
-	anticoagulant := int64(dataBody["anticoagulant"].(float64))
-	kaliumstr := dataBody["kalium"].(string)
+	dialysis_count, _ := this.GetInt64("dialysis_count")
+	hd_count, _ := this.GetInt64("hd_count")
+	hdf_count, _ := this.GetInt64("hdf_count")
+	hp_count, _ := this.GetInt64("hp_count")
+	other_count, _ := this.GetInt64("other_count")
+	dialzer_apparatus := this.GetString("dialzer_apparatus")
+	perfusion_apparatus := this.GetString("perfusion_apparatus")
+	anticoagulant, _ := this.GetInt64("anticoagulant")
+	kaliumstr := this.GetString("kalium")
 	kalium, _ := strconv.ParseFloat(kaliumstr, 64)
-	autunitestr := dataBody["autunite"].(string)
+
+	autunitestr := this.GetString("autunite")
 	autunite, _ := strconv.ParseFloat(autunitestr, 64)
-	natriumstr := dataBody["natrium"].(string)
+	natriumstr := this.GetString("natrium")
 	natrium, _ := strconv.ParseFloat(natriumstr, 64)
-	hour := int64(dataBody["hour"].(float64))
-	minute := int64(dataBody["minute"].(float64))
-	beforWeight := dataBody["befor_weight"].(string)
+	hour, _ := this.GetInt64("hour")
+	minute, _ := this.GetInt64("minute")
+	beforWeight := this.GetString("befor_weight")
 	befor_weight, _ := strconv.ParseFloat(beforWeight, 64)
-	afterWeight := dataBody["after_weight"].(string)
+	afterWeight := this.GetString("after_weight")
 	after_weight, _ := strconv.ParseFloat(afterWeight, 64)
-	befor_pressure := dataBody["befor_pressure"].(string)
-	template_summary_content := dataBody["template_summary_content"].(string)
-	template_plan_content := dataBody["template_plan_content"].(string)
-	admin_user_id := int64(dataBody["admin_user_id"].(float64))
-	record_time := dataBody["record_time"].(string)
+	befor_pressure := this.GetString("befor_pressure")
+	template_summary_content := this.GetString("template_summary_content")
+	template_plan_content := this.GetString("template_plan_content")
+	admin_user_id, _ := this.GetInt64("admin_user_id")
+	record_time := this.GetString("record_time")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	recordTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_time, loc)
-	after_pressure := dataBody["after_pressure"].(string)
-	template_summary_id := int64(dataBody["template_summary_id"].(float64))
-	template_plan_id := int64(dataBody["template_plan_id"].(float64))
-	patient_id := int64(dataBody["patient_id"].(float64))
+	after_pressure := this.GetString("after_pressure")
+	template_summary_id, _ := this.GetInt64("template_summary_id")
+	template_plan_id, _ := this.GetInt64("template_plan_id")
+	template_inspection_id, _ := this.GetInt64("template_inspection_id")
+	patient_id, _ := this.GetInt64("patient_id")
+	fmt.Println("patient_id", patient_id)
 	orgId := this.GetAdminUserInfo().CurrentOrgId
-	inspect_date := dataBody["inspect_date"].(string)
-	project_id := dataBody["project_id"].(string)
-	template_inspection_id := int64(dataBody["template_inspection_id"].(float64))
-
-	//id, _ := this.GetInt64("id")
-	//title := this.GetString("title")
-	//
-	//dryWeight := this.GetString("dry_weight")
-	//dry_weight, _ := strconv.ParseFloat(dryWeight, 64)
-	//dialysis_count, _ := this.GetInt64("dialysis_count")
-	//hd_count, _ := this.GetInt64("hd_count")
-	//hdf_count, _ := this.GetInt64("hdf_count")
-	//hp_count, _ := this.GetInt64("hp_count")
-	//other_count, _ := this.GetInt64("other_count")
-	//dialzer_apparatus := this.GetString("dialzer_apparatus")
-	//perfusion_apparatus := this.GetString("perfusion_apparatus")
-	//anticoagulant, _ := this.GetInt64("anticoagulant")
-	//kaliumstr := this.GetString("kalium")
-	//kalium, _ := strconv.ParseFloat(kaliumstr, 64)
-	//
-	//autunitestr := this.GetString("autunite")
-	//autunite, _ := strconv.ParseFloat(autunitestr, 64)
-	//natriumstr := this.GetString("natrium")
-	//natrium, _ := strconv.ParseFloat(natriumstr, 64)
-	//hour, _ := this.GetInt64("hour")
-	//minute, _ := this.GetInt64("minute")
-	//beforWeight := this.GetString("befor_weight")
-	//befor_weight, _ := strconv.ParseFloat(beforWeight, 64)
-	//afterWeight := this.GetString("after_weight")
-	//after_weight, _ := strconv.ParseFloat(afterWeight, 64)
-	//befor_pressure := this.GetString("befor_pressure")
-	//template_summary_content := this.GetString("template_summary_content")
-	//template_plan_content := this.GetString("template_plan_content")
-	//admin_user_id, _ := this.GetInt64("admin_user_id")
-	//record_time := this.GetString("record_time")
-	//timeLayout := "2006-01-02"
-	//loc, _ := time.LoadLocation("Local")
-	//recordTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_time, loc)
-	//after_pressure := this.GetString("after_pressure")
-	//template_summary_id, _ := this.GetInt64("template_summary_id")
-	//template_plan_id, _ := this.GetInt64("template_plan_id")
-	//template_inspection_id, _ := this.GetInt64("template_inspection_id")
-	//patient_id, _ := this.GetInt64("patient_id")
-	//fmt.Println("patient_id", patient_id)
-	//orgId := this.GetAdminUserInfo().CurrentOrgId
-	//inspect_date := this.GetString("inspect_date")
-	//project_id := this.GetString("project_id")
+	inspect_date := this.GetString("inspect_date")
+	project_id := this.GetString("project_id")
 	summary := models.XtTemplateSummary{
 		ID:                     id,
 		StartYear:              0,
@@ -1230,41 +1191,42 @@ func (this *DoctorsApiController) HospitalSummary() {
 
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
-	admission_time := this.GetString("admission_time")
+
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	fmt.Print("err", err)
+	admission_time := dataBody["admission_time"].(string)
 	admissionTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", admission_time+" 00:00:00", loc)
 	admissiontime := admissionTimes.Unix()
+	admitting_diagnosis := dataBody["admitting_diagnosis"].(string)
+	admitting_diagnosis_id := dataBody["admitting_diagnosis_id"].(string)
+	connecticut := dataBody["connecticut"].(string)
+	dean := int64(dataBody["dean"].(float64))
+	discharge_diagnosis := dataBody["discharge_diagnosis"].(string)
+	discharge_diagnosis_id := dataBody["discharge_diagnosis_id"].(string)
+	diagnosis_admission := dataBody["diagnosis_admission"].(string)
+	diagnosis_admission_id := dataBody["diagnosis_admission_id"].(string)
+	discharge_advice_id := dataBody["discharge_advice_id"].(string)
+	discharge_advice := dataBody["discharge_advice"].(string)
+	discharge_time := dataBody["discharge_time"].(string)
 
-	admitting_diagnosis := this.GetString("admitting_diagnosis")
-	admitting_diagnosis_id := this.GetString("admitting_diagnosis_id")
-
-	connecticut := this.GetString("connecticut")
-	dean, _ := this.GetInt64("dean")
-	discharge_diagnosis := this.GetString("discharge_diagnosis")
-
-	discharge_diagnosis_id := this.GetString("discharge_diagnosis_id")
-	diagnosis_admission := this.GetString("diagnosis_admission")
-	diagnosis_admission_id := this.GetString("diagnosis_admission_id")
-	discharge_advice_id := this.GetString("discharge_advice_id")
-	discharge_advice := this.GetString("discharge_advice")
-
-	discharge_time := this.GetString("discharge_time")
 	dischargeTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", discharge_time+" 00:00:00", loc)
 	dischargetime := dischargeTimes.Unix()
-	doctor, _ := this.GetInt64("doctor")
-	illness_discharge_id := this.GetString("illness_discharge_id")
-	illness_discharge := this.GetString("illness_discharge")
-	nuclear_magnetic_resonance := this.GetString("nuclear_magnetic_resonance")
-	pathology := this.GetString("pathology")
-	record_date := this.GetString("record_date")
+	doctor := int64(dataBody["doctor"].(float64))
+	illness_discharge_id := dataBody["illness_discharge_id"].(string)
+	illness_discharge := dataBody["illness_discharge"].(string)
+	nuclear_magnetic_resonance := dataBody["nuclear_magnetic_resonance"].(string)
+	pathology := dataBody["pathology"].(string)
+	record_date := dataBody["record_date"].(string)
 	recordDates, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
 	recordtime := recordDates.Unix()
-	sick_personnel := this.GetString("sick_personnel")
-	title := this.GetString("title")
-	treatment_id := this.GetString("treatment_id")
-	treatment := this.GetString("treatment")
-	ultrasound := this.GetString("ultrasound")
-	xray := this.GetString("xray")
-	patient_id, _ := this.GetInt64("patient_id")
+	sick_personnel := dataBody["sick_personnel"].(string)
+	title := dataBody["title"].(string)
+	treatment_id := dataBody["treatment_id"].(string)
+	treatment := dataBody["treatment"].(string)
+	ultrasound := dataBody["ultrasound"].(string)
+	xray := dataBody["xray"].(string)
+	patient_id := int64(dataBody["patient_id"].(float64))
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	summary := models.XtHospitalSummary{
 		PatientId:                patient_id,
@@ -1312,8 +1274,10 @@ func (this *DoctorsApiController) GetHospitalSummaryList() {
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	patient_id, _ := this.GetInt64("patient_id")
 	start_time := this.GetString("start_time")
+	fmt.Println("start_tim232232323232323232323232332", start_time)
 	dischargeTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 	startime := dischargeTimes.Unix()
+	fmt.Println("startime1111111111111111111111", startime)
 	end_time := this.GetString("end_time")
 	endTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 00:00:00", loc)
 	endtime := endTimes.Unix()
@@ -1342,43 +1306,42 @@ func (this *DoctorsApiController) UpdateHospitalSummary() {
 
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
-	admission_time := this.GetString("admission_time")
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	fmt.Print("err", err)
+	admission_time := dataBody["admission_time"].(string)
 	admissionTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", admission_time+" 00:00:00", loc)
 	admissiontime := admissionTimes.Unix()
+	admitting_diagnosis := dataBody["admitting_diagnosis"].(string)
+	admitting_diagnosis_id := dataBody["admitting_diagnosis_id"].(string)
+	connecticut := dataBody["connecticut"].(string)
+	dean := int64(dataBody["dean"].(float64))
+	discharge_diagnosis := dataBody["discharge_diagnosis"].(string)
+	discharge_diagnosis_id := dataBody["discharge_diagnosis_id"].(string)
+	diagnosis_admission := dataBody["diagnosis_admission"].(string)
+	diagnosis_admission_id := dataBody["diagnosis_admission_id"].(string)
+	discharge_advice_id := dataBody["discharge_advice_id"].(string)
+	discharge_advice := dataBody["discharge_advice"].(string)
+	discharge_time := dataBody["discharge_time"].(string)
 
-	id, _ := this.GetInt64("id")
-	admitting_diagnosis := this.GetString("admitting_diagnosis")
-	admitting_diagnosis_id := this.GetString("admitting_diagnosis_id")
-
-	connecticut := this.GetString("connecticut")
-	dean, _ := this.GetInt64("dean")
-	discharge_diagnosis := this.GetString("discharge_diagnosis")
-
-	discharge_diagnosis_id := this.GetString("discharge_diagnosis_id")
-	diagnosis_admission := this.GetString("diagnosis_admission")
-	diagnosis_admission_id := this.GetString("diagnosis_admission_id")
-	discharge_advice_id := this.GetString("discharge_advice_id")
-	discharge_advice := this.GetString("discharge_advice")
-
-	discharge_time := this.GetString("discharge_time")
 	dischargeTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", discharge_time+" 00:00:00", loc)
 	dischargetime := dischargeTimes.Unix()
-	doctor, _ := this.GetInt64("doctor")
-	illness_discharge_id := this.GetString("illness_discharge_id")
-	illness_discharge := this.GetString("illness_discharge")
-	nuclear_magnetic_resonance := this.GetString("nuclear_magnetic_resonance")
-	pathology := this.GetString("pathology")
-	record_date := this.GetString("record_date")
+	doctor := int64(dataBody["doctor"].(float64))
+	illness_discharge_id := dataBody["illness_discharge_id"].(string)
+	illness_discharge := dataBody["illness_discharge"].(string)
+	nuclear_magnetic_resonance := dataBody["nuclear_magnetic_resonance"].(string)
+	pathology := dataBody["pathology"].(string)
+	record_date := dataBody["record_date"].(string)
 	recordDates, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
 	recordtime := recordDates.Unix()
-	sick_personnel := this.GetString("sick_personnel")
-	title := this.GetString("title")
-	treatment_id := this.GetString("treatment_id")
-	treatment := this.GetString("treatment")
-	ultrasound := this.GetString("ultrasound")
-	xray := this.GetString("xray")
-	patient_id, _ := this.GetInt64("patient_id")
-
+	sick_personnel := dataBody["sick_personnel"].(string)
+	title := dataBody["title"].(string)
+	treatment_id := dataBody["treatment_id"].(string)
+	treatment := dataBody["treatment"].(string)
+	ultrasound := dataBody["ultrasound"].(string)
+	xray := dataBody["xray"].(string)
+	patient_id := int64(dataBody["patient_id"].(float64))
+	id := int64(dataBody["id"].(float64))
 	summary := models.XtHospitalSummary{
 		PatientId:                patient_id,
 		AdmissionTime:            admissiontime,
@@ -1408,7 +1371,7 @@ func (this *DoctorsApiController) UpdateHospitalSummary() {
 		DeanId:                   dean,
 		DischargeDiagnosisId:     discharge_diagnosis_id,
 	}
-	err := service.UpdateHospital(id, summary)
+	err = service.UpdateHospital(id, summary)
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"detail": summary,
@@ -1419,11 +1382,25 @@ func (this *DoctorsApiController) UpdateHospitalSummary() {
 
 func (this *DoctorsApiController) DeleteHospitalSummary() {
 
-	id, _ := this.GetInt64("id")
-	err := service.DeleteHospitalSummary(id)
+	schIDStr := this.GetString("ids")
+	idStrs := strings.Split(schIDStr, ",")
+	err := service.DeleteHospitalSummary(idStrs)
 	fmt.Println(err)
 	returnData := make(map[string]interface{}, 0)
 	returnData["msg"] = "ok"
 	this.ServeSuccessJSON(returnData)
 	return
 }
+
+func (this *DoctorsApiController) GetPatientInfo() {
+
+	patient_id, _ := this.GetInt64("patient_id")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	detail, err := service.GetPatientDetail(patient_id, orgId)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"patient": detail,
+		})
+		return
+	}
+}

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -98,8 +98,8 @@ func (this *DialysisAPIController) Scheduals() {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		} else {
 			if len(scheduals) > 0 {
-				patients, _ := service.GetAllPatientListByList(orgID)
-				devices, _ := service.GetAllDevicetByList(orgID)
+				patients, _ := service.GetAllPatientListSix(orgID)
+				devices, _ := service.GetAllDevicetByListSix(orgID)
 				advices, _ := service.GetAllAdvicestByList(orgID, date.Unix())
 				prescriptions, _ := service.GetAllPrescriptionsByList(orgID, date.Unix())
 				assessmentBefores, _ := service.GetAllAssessmentBeforesByList(orgID, date.Unix())
@@ -624,10 +624,6 @@ func (c *DialysisAPIController) PostAtreatmentInfo() {
 		return
 	}
 
-	//now := time.Now()
-	//year, month, day := now.Date()
-	//today_time := time.Date(year, month, day, 0, 0, 0, 0, time.Local)
-	//todayTimeStamp := today_time.Unix()
 	summary := models.TreatmentSummary{
 		UserOrgId:       adminUserInfo.Org.Id,
 		PatientId:       id,
@@ -655,6 +651,7 @@ func (c *DialysisAPIController) PostAtreatmentInfo() {
 		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":treatment_summarys_list_all"
 		redis.Set(keyOne, "", time.Second)
 		keyThree := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+		fmt.Println("keyThree2332323232323", keyThree)
 		redis.Set(keyThree, "", time.Second)
 		defer redis.Close()
 		c.ServeSuccessJSON(map[string]interface{}{
@@ -1570,6 +1567,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		}
 
 		prescription.ID = dialysisPrescription.ID
+
 		err := service.UpDateDialysisPrescription(&prescription)
 		//获取key,清空redis
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"

controllers/mobile_api_controllers/doctor_advice_api_controller.go

@@ -5,6 +5,8 @@ import (
 	"XT_New/models"
 	"XT_New/service"
 	"XT_New/utils"
+	"strconv"
+	"time"
 )
 
 type DoctorAdviceAPIController struct {
@@ -15,6 +17,7 @@ type DoctorAdviceAPIController struct {
 // @param date:string (yyyy-mm-dd)
 // @param advice_type:int 1长期医嘱 3临时医嘱 其他:全部
 func (this *DoctorAdviceAPIController) ScheduleAdvices() {
+
 	schedualDate := this.GetString("date")
 	adviceType, _ := this.GetInt("advice_type")
 	patientType, _ := this.GetInt("patient_type")
@@ -36,9 +39,12 @@ func (this *DoctorAdviceAPIController) ScheduleAdvices() {
 
 	adminInfo := this.GetMobileAdminUserInfo()
 	orgID := adminInfo.Org.Id
+	redis := service.RedisClient()
+	key := strconv.FormatInt(orgID, 10) + ":" + ":patient_list_all"
+	redis.Set(key, "", time.Second)
 	scheduals, err := service.MobileGetScheduleDoctorAdvicesTwo(orgID, date.Unix(), adviceType, patientType, adminInfo.AdminUser.Id, delivery_way)
 	//获取所有的患者
-	blood_patients, _ := service.GetAllPatientListByListTwo(orgID)
+	blood_patients, _ := service.GetAllPatientListByListSeven(orgID)
 	//获取透析处方
 	blood_prescriptions, _ := service.GetAllPrescriptionByListOne(orgID, date.Unix())
 	//获取上机
@@ -95,7 +101,6 @@ func (this *DoctorAdviceAPIController) ScheduleAdvices() {
 			}
 		}
 
-
 		//获取所有的患者
 		patients, _ := service.GetAllPatientListByListTwo(orgID)
 

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1490,7 +1490,7 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 		dewater_amount = 0
 	}
 	// 计算透析处方的相关超滤量
-	schedual, _ := service.MobileGetSchedualDetail(adminUserInfo.Org.Id, patient.ID, theAssessmentDateTime)
+	schedual, _ := service.MobileGetSchedualDetailSix(adminUserInfo.Org.Id, patient.ID, theAssessmentDateTime)
 	var lastDialysisPrescribe *models.DialysisPrescription
 	var dialysisSolution *models.DialysisSolution
 	var dialysisPrescribe *models.DialysisPrescription
@@ -1499,11 +1499,11 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 	var mode_id int64
 
 	dialysisPrescribe, _ = service.MobileGetDialysisPrescribe(adminUserInfo.Org.Id, id, theAssessmentDateTime)
-	lastDialysisPrescribe, _ = service.MobileGetLastDialysisPrescribeByModeId(adminUserInfo.Org.Id, id, schedual.ModeId)
+	lastDialysisPrescribe, _ = service.MobileGetLastDialysisPrescribeByModeIdSix(adminUserInfo.Org.Id, id, schedual.ModeId)
 	if schedual != nil {
 		// 获取透析模版
-		dialysisSolution, _ = service.MobileGetDialysisSolutionByModeId(adminUserInfo.Org.Id, id, schedual.ModeId)
-		system_dialysisPrescribe, _ = service.MobileGetSystemDialysisPrescribeByModeId(adminUserInfo.Org.Id, schedual.ModeId)
+		dialysisSolution, _ = service.MobileGetDialysisSolutionByModeIdSix(adminUserInfo.Org.Id, id, schedual.ModeId)
+		system_dialysisPrescribe, _ = service.MobileGetSystemDialysisPrescribeByModeIdSix(adminUserInfo.Org.Id, schedual.ModeId)
 
 		mode_id = schedual.ModeId
 	} else {
@@ -1571,11 +1571,62 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 		newprescribe.Status = 1
 		newprescribe.DialysisDialyszers = dialysisSolution.DialysisDialyszers
 		newprescribe.DialysisIrrigation = dialysisSolution.DialysisIrrigation
+		_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, theAssessmentDateTime, adminUserInfo.Org.Id)
+		newprescribe.ID = dialysisPrescription.ID
 
-		err := service.AddSigleRecord(&newprescribe)
-		if err != nil {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
+		if dialysisPrescription.ID == 0 {
+			fmt.Println("处方11111111111")
+			err := service.AddSigleRecord(&newprescribe)
+			//获取key,清空redis
+			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
+			redis := service.RedisClient()
+
+			//清空key 值
+			redis.Set(key, "", time.Second)
+
+			keyOne := "scheduals_" + assessmentDate + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+			//清空key 值
+			redis.Set(keyOne, "", time.Second)
+
+			keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_solution"
+			//清空key 值
+			redis.Set(keyTwo, "", time.Second)
+
+			keySix := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":prescriptions_list_all"
+			redis.Set(keySix, "", time.Second)
+
+			keySeven := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":dialysis_prescribe_by_mode"
+			redis.Set(keySeven, "", time.Second)
+			if err != nil {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
+			}
+		} else {
+			err := service.UpDateDialysisPrescription(&newprescribe)
+			//获取key,清空redis
+			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
+			redis := service.RedisClient()
+
+			//清空key 值
+			redis.Set(key, "", time.Second)
+
+			keyOne := "scheduals_" + assessmentDate + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+			//清空key 值
+			redis.Set(keyOne, "", time.Second)
+
+			keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_solution"
+			//清空key 值
+			redis.Set(keyTwo, "", time.Second)
+
+			keySix := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":prescriptions_list_all"
+			redis.Set(keySix, "", time.Second)
+
+			keySeven := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":dialysis_prescribe_by_mode"
+			redis.Set(keySeven, "", time.Second)
+			if err != nil {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
+			}
 		}
+
 	}
 
 	if dialysisPrescribe == nil && dialysisSolution == nil {
@@ -1628,7 +1679,60 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 			newprescribe.Status = 1
 			newprescribe.DialysisIrrigation = lastDialysisPrescribe.DialysisIrrigation
 			newprescribe.DialysisDialyszers = lastDialysisPrescribe.DialysisDialyszers
-			err := service.AddSigleRecord(&newprescribe)
+			_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, theAssessmentDateTime, adminUserInfo.Org.Id)
+			newprescribe.ID = dialysisPrescription.ID
+			if dialysisPrescription.ID == 0 {
+				err := service.AddSigleRecord(&newprescribe)
+				//获取key,清空redis
+				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
+				redis := service.RedisClient()
+
+				//清空key 值
+				redis.Set(key, "", time.Second)
+
+				keyOne := "scheduals_" + assessmentDate + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+				//清空key 值
+				redis.Set(keyOne, "", time.Second)
+
+				keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_solution"
+				//清空key 值
+				redis.Set(keyTwo, "", time.Second)
+
+				keySix := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":prescriptions_list_all"
+				redis.Set(keySix, "", time.Second)
+
+				keySeven := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":dialysis_prescribe_by_mode"
+				redis.Set(keySeven, "", time.Second)
+				fmt.Println("处方2222222222")
+				if err != nil {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
+				}
+			} else {
+				err := service.UpDateDialysisPrescription(&newprescribe)
+				//获取key,清空redis
+				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
+				redis := service.RedisClient()
+
+				//清空key 值
+				redis.Set(key, "", time.Second)
+
+				keyOne := "scheduals_" + assessmentDate + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+				//清空key 值
+				redis.Set(keyOne, "", time.Second)
+
+				keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_solution"
+				//清空key 值
+				redis.Set(keyTwo, "", time.Second)
+
+				keySix := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":prescriptions_list_all"
+				redis.Set(keySix, "", time.Second)
+
+				keySeven := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":dialysis_prescribe_by_mode"
+				redis.Set(keySeven, "", time.Second)
+				if err != nil {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
+				}
+			}
 			if err != nil {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
 			}
@@ -1682,7 +1786,61 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 			newprescribe.Status = 1
 			newprescribe.DialysisDialyszers = system_dialysisPrescribe.DialysisDialyszers
 			newprescribe.DialysisIrrigation = system_dialysisPrescribe.DialysisIrrigation
-			err := service.AddSigleRecord(&newprescribe)
+			_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, theAssessmentDateTime, adminUserInfo.Org.Id)
+			newprescribe.ID = dialysisPrescription.ID
+			if dialysisPrescription.ID == 0 {
+				err := service.AddSigleRecord(&newprescribe)
+
+				fmt.Println("处方2222222222")
+				//获取key,清空redis
+				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
+				redis := service.RedisClient()
+
+				//清空key 值
+				redis.Set(key, "", time.Second)
+
+				keyOne := "scheduals_" + assessmentDate + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+				//清空key 值
+				redis.Set(keyOne, "", time.Second)
+
+				keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_solution"
+				//清空key 值
+				redis.Set(keyTwo, "", time.Second)
+
+				keySix := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":prescriptions_list_all"
+				redis.Set(keySix, "", time.Second)
+
+				keySeven := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":dialysis_prescribe_by_mode"
+				redis.Set(keySeven, "", time.Second)
+				if err != nil {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
+				}
+			} else {
+				err := service.UpDateDialysisPrescription(&newprescribe)
+				//获取key,清空redis
+				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
+				redis := service.RedisClient()
+
+				//清空key 值
+				redis.Set(key, "", time.Second)
+
+				keyOne := "scheduals_" + assessmentDate + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+				//清空key 值
+				redis.Set(keyOne, "", time.Second)
+
+				keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_solution"
+				//清空key 值
+				redis.Set(keyTwo, "", time.Second)
+
+				keySix := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":prescriptions_list_all"
+				redis.Set(keySix, "", time.Second)
+
+				keySeven := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":dialysis_prescribe_by_mode"
+				redis.Set(keySeven, "", time.Second)
+				if err != nil {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
+				}
+			}
 			if err != nil {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
 			}
@@ -1699,7 +1857,60 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 			newprescribe.TargetUltrafiltration = dewater_amount
 			newprescribe.Status = 1
 
-			err := service.AddSigleRecord(&newprescribe)
+			_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, theAssessmentDateTime, adminUserInfo.Org.Id)
+			newprescribe.ID = dialysisPrescription.ID
+			if dialysisPrescription.ID == 0 {
+				err := service.AddSigleRecord(&newprescribe)
+				fmt.Println("处方44444444444")
+				//获取key,清空redis
+				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
+				redis := service.RedisClient()
+
+				//清空key 值
+				redis.Set(key, "", time.Second)
+
+				keyOne := "scheduals_" + assessmentDate + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+				//清空key 值
+				redis.Set(keyOne, "", time.Second)
+
+				keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_solution"
+				//清空key 值
+				redis.Set(keyTwo, "", time.Second)
+
+				keySix := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":prescriptions_list_all"
+				redis.Set(keySix, "", time.Second)
+
+				keySeven := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":dialysis_prescribe_by_mode"
+				redis.Set(keySeven, "", time.Second)
+				if err != nil {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
+				}
+			} else {
+				err := service.UpDateDialysisPrescription(&newprescribe)
+				//获取key,清空redis
+				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
+				redis := service.RedisClient()
+
+				//清空key 值
+				redis.Set(key, "", time.Second)
+
+				keyOne := "scheduals_" + assessmentDate + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+				//清空key 值
+				redis.Set(keyOne, "", time.Second)
+
+				keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_solution"
+				//清空key 值
+				redis.Set(keyTwo, "", time.Second)
+
+				keySix := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":prescriptions_list_all"
+				redis.Set(keySix, "", time.Second)
+
+				keySeven := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":dialysis_prescribe_by_mode"
+				redis.Set(keySeven, "", time.Second)
+				if err != nil {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
+				}
+			}
 			if err != nil {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
 			}

controllers/print_data_api_controller.go

@@ -113,26 +113,25 @@ func (this *PrintDataAPIController) StockRecordPrintData() {
 }
 
 func (this *PrintDataAPIController) CourseRecordPrintData() {
-	id, _ := this.GetInt64("id", 0)
+	ids_str := this.GetString("ids")
+	ids_arr := strings.Split(ids_str, ",")
 	adminUserInfo := this.GetAdminUserInfo()
-
-	if id == 0 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
-	}
-	timeLayout := "2006-01-02 15:04:05"
-	record, err := service.GetPatientCoursesRecords(adminUserInfo.CurrentOrgId, id)
-	dataTimeStr := time.Unix(record.RecordTime, 0).Format(timeLayout) //设置时间戳 使用模板格式化为日期字符串
-	tempTime := strings.Split(dataTimeStr, " ")
-
-	recordDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", tempTime[0])
-	if parseDateErr != nil {
-		this.ErrorLog("日期(%v)解析错误：%v", tempTime[0], parseDateErr)
-		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		//return
-	}
-
-	patient, _ := service.FindPatientWithDeviceById(adminUserInfo.CurrentOrgId, record.PatientID, recordDate.Unix())
+	patient_id, _ := this.GetInt64("patient_id")
+
+	//timeLayout := "2006-01-02 15:04:05"
+	record, err := service.GetPatientCoursesRecords(adminUserInfo.CurrentOrgId, ids_arr)
+	//dataTimeStr := time.Unix(record.RecordTime, 0).Format(timeLayout) //设置时间戳 使用模板格式化为日期字符串
+	//tempTime := strings.Split(dataTimeStr, " ")
+	//
+	//recordDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", tempTime[0])
+	//if parseDateErr != nil {
+	//	this.ErrorLog("日期(%v)解析错误：%v", tempTime[0], parseDateErr)
+	//	//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+	//	//return
+	//}
+
+	//patient, _ := service.FindPatientWithDeviceById(adminUserInfo.CurrentOrgId, patient_id)
+	patient, _ := service.GetPatientDetail(adminUserInfo.CurrentOrgId, patient_id)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return

controllers/qiniiu_api_controller.go

@@ -22,7 +22,7 @@ func (c *QiNiuApiController) GetQNUpToken() {
 	defer redisClient.Close()
 
 	token, err := redisClient.Get("qn_token").Result()
-	fmt.Print("token------------------------------------", token)
+
 	if err != nil {
 		defer fmt.Println(err)
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeGetQiniuUpToken)

controllers/schedule_api_controller.go

@@ -67,6 +67,7 @@ func ScheduleApiRegistRouters() {
 	beego.Router("/api/order/changefuncprint", &ScheduleApiController{}, "Get:ChangeFuncPrint")
 	beego.Router("/api/order/getdataprint", &ScheduleApiController{}, "Get:GetDataPrint")
 	beego.Router("/api/schedule/getnextweekpanels", &ScheduleApiController{}, "Get:GetNextWeekPanels")
+	beego.Router("/api/schedule/synchroschedule", &ScheduleApiController{}, "Get:SynchroSchedule")
 }
 
 func (c *ScheduleApiController) GetWeekPanels() {
@@ -367,7 +368,9 @@ func (c *ScheduleApiController) CreateSchedule() {
 	}
 
 	redis := service.RedisClient()
+
 	err = service.CreateSchedule(&schedule)
+
 	key := "scheduals_" + scheduleDate + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
 
 	redis.Set(key, "", time.Second)
@@ -1400,6 +1403,8 @@ func (this *ScheduleApiController) ExportSchedule() {
 			//err := service.UpdateScheduleStatus(clear_schedule_date, this.GetAdminUserInfo().CurrentOrgId)
 			if err == nil {
 				for _, item := range schedules {
+					//删除当天的日期排班
+					service.DeleteScheduleExist(item.ScheduleDate, item.UserOrgId)
 					//查找当天日期是否存在
 					_, errcode := service.GetTodayScheduleIsExist(item.PatientId, item.ScheduleDate, item.UserOrgId, item.ModeId, item.ScheduleType)
 					if errcode == gorm.ErrRecordNotFound {
@@ -2731,3 +2736,79 @@ func (c *ScheduleApiController) GetNextWeekPanels() {
 		"schedule": schedule,
 	})
 }
+
+func (c *ScheduleApiController) SynchroSchedule() {
+
+	template_id, _ := c.GetInt64("template_id")
+	copy_startime, _ := c.GetInt64("copy_startime")
+	copy_endtime, _ := c.GetInt64("copy_endtime")
+
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	//根据模板ID获取模板数据
+	list, _ := service.GetTemplateListByTemplateId(template_id, orgId)
+	//清空该时间段的所有排班数据
+	service.DeletePatientSchedule(copy_startime, copy_endtime, orgId)
+
+	var tuesday int64
+	var wednesday int64
+	var thursday int64
+	var friday int64
+	var saturday int64
+
+	tuesday = copy_startime + 86400
+	wednesday = copy_startime + 172800
+	thursday = copy_startime + 259200
+	friday = copy_startime + 345600
+	saturday = copy_startime + 432000
+
+	for _, item := range list {
+		if item.Weekday == 1 {
+			item.ScheduleDate = copy_startime
+		}
+		if item.Weekday == 2 {
+			item.ScheduleDate = tuesday
+		}
+		if item.Weekday == 3 {
+			item.ScheduleDate = wednesday
+		}
+		if item.Weekday == 4 {
+			item.ScheduleDate = thursday
+		}
+		if item.Weekday == 5 {
+			item.ScheduleDate = friday
+		}
+		if item.Weekday == 6 {
+			item.ScheduleDate = saturday
+		}
+		if item.Weekday == 7 {
+			item.ScheduleDate = copy_endtime
+		}
+
+		//根据床位号获取区号
+		number, _ := service.GetBedNumberById(item.DeviceNumberID, orgId)
+		item.ZoneId = number.ZoneID
+	}
+
+	for _, item := range list {
+		schedule := models.XtSchedule{
+			UserOrgId:    orgId,
+			PartitionId:  item.ZoneId,
+			BedId:        item.DeviceNumberID,
+			PatientId:    item.PatientID,
+			ScheduleDate: item.ScheduleDate,
+			ScheduleType: item.TimeType,
+			ScheduleWeek: item.Weekday,
+			ModeId:       item.TreatMode,
+			Status:       1,
+			CreatedTime:  time.Now().Unix(),
+			UpdatedTime:  0,
+		}
+
+		service.CreatePatientSchedule(&schedule)
+	}
+
+	returnData := make(map[string]interface{}, 0)
+	returnData["list"] = list
+	c.ServeSuccessJSON(returnData)
+	return
+}

controllers/schedule_template_api_controller.go

@@ -6,6 +6,7 @@ import (
 	"XT_New/service"
 	"XT_New/utils"
 	"encoding/json"
+	"fmt"
 	"time"
 
 	"github.com/astaxie/beego"
@@ -76,6 +77,8 @@ func (this *PatientScheduleTemplateAPIController) InitData() {
 	}
 
 	deviceNumbers, getDeviceNumbersErr := service.GetScheduleValidDeviceNumbers(adminUserInfo.CurrentOrgId)
+
+	fmt.Println("deviceNumbers233323232332232323223233223323232323", deviceNumbers)
 	if getDeviceNumbersErr != nil {
 		this.ErrorLog("获取床位号失败：%v", getDeviceNumbersErr)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)

main.go

@@ -11,7 +11,7 @@ func init() {
 }
 
 func main() {
-	//service.BeginAutoCreateWeekSchedulesJob()
+	service.BeginAutoCreateWeekSchedulesJob()
 	//service.BeginAutoCreateWeekDisinfectionJob()
 	//service.BeginAutoCreatePlanJob()
 	//service.AutoClearSchedules()

models/patient_schedule_template_models.go

@@ -44,3 +44,24 @@ type PatientScheduleTemplateItem struct {
 func (PatientScheduleTemplateItem) TableName() string {
 	return "xt_patient_schedule_template_item"
 }
+
+type VmPatientScheduleTemplateItem struct {
+	ID             int64 `gorm:"column:id" json:"id" form:"id"`
+	OrgID          int64 `gorm:"column:org_id" json:"-" form:"org_id"`
+	TemplateID     int64 `gorm:"column:template_id" json:"template_id" form:"template_id"`
+	DeviceNumberID int64 `gorm:"column:device_number_id" json:"device_number_id" form:"device_number_id"`
+	PatientID      int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	TreatMode      int64 `gorm:"column:treat_mode" json:"treat_mode" form:"treat_mode"` // 治疗模式
+	Weekday        int64 `gorm:"column:weekday" json:"weekday" form:"weekday"`          // 周一-周日 1-7
+	TimeType       int64 `gorm:"column:time_type" json:"time_type" form:"time_type"`    // 上下晚 123
+	Status         int64 `gorm:"column:status" json:"-" form:"status"`
+	CreateTime     int64 `gorm:"column:ctime" json:"-" form:"ctime"`
+	ModifyTime     int64 `gorm:"column:mtime" json:"-" form:"mtime"`
+	IsExport       int64 `gorm:"column:is_export" json:"is_export" form:"is_export"`
+	ScheduleDate   int64
+	ZoneId         int64
+}
+
+func (VmPatientScheduleTemplateItem) TableName() string {
+	return "xt_patient_schedule_template_item"
+}

service/auto_clear_schedules_service.go

@@ -33,8 +33,7 @@ func AutoClearSchedules() {
 	scheduleDate := utils.ZeroHourTimeOfDay(time.Now())
 	for _, item := range schedules {
 		//将今天(不包括今天)以前的的排班数据进行软删除
-		writeDb.
-			Table("xt_schedule as s").
+		writeDb.Table("xt_schedule as s").
 			Where("s.schedule_date < ? AND s.status = 1 AND "+
 				"s.user_org_id = ? AND "+
 				"NOT EXISTS (Select * FROM `xt_dialysis_order` as d Where  d.`status` = 1 AND"+

service/auto_create_staff_schedule_service.go

@@ -69,7 +69,6 @@ func AutoCreateStaffScheduleJob() {
 	// 获取所有机构信息
 	orgs, _ := GetAllOrgs()
 	for _, item := range orgs {
-		fmt.Println(item)
 		//查询该机构是否开启连续排班功能
 		schdule, _ := GetAutoContinueSchdule(item.ID)
 		//如果状态值未开启不生成连续排班
@@ -131,9 +130,14 @@ func GeThisWeekScheduleData(orgid int64, startime int64, endtime int64) (staffsc
 }
 
 func AddSchedules(schedule *models.StaffSchedule) error {
-
+	tx := writeDb.Begin()
 	err := XTWriteDB().Model(&schedule).Create(&schedule).Error
-	return err
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	tx.Commit()
+	return nil
 }
 
 func GetNextWeekData(orgid int64, docid int64, scheduledate int64) (*models.StaffSchedule, error) {

service/auto_create_week_schedules_service.go

@@ -147,6 +147,7 @@ func _refreshWeekSchedulesWithTemplateItems(tx *gorm.DB, orgID int64, week time.
 
 	// 批量插入排班
 	if len(templateItems) > 0 {
+
 		valueStrs := make([]string, 0, len(templateItems))
 		values := make([]interface{}, 0, len(templateItems)*11)
 		for _, item := range templateItems {

service/dialysis_service.go

@@ -726,51 +726,54 @@ func GetDialysisWatch(orgID int64, schedulDate int64, schedulType int64, partiti
 	return schedule, err, total
 }
 
-func GetDialysisWatchByKeyword(orgID int64, keyword string, schedulType int64, partitionType int64, page int64, limit int64) (schedules []*models.DialysisSchedule, err error, total int64) {
-	//var patients []*models.Patients
-	//getPatientErr := readDb.Model(&models.Patients{}).Where("status = 1 AND user_org_id = ? AND (name like ? OR dialysis_no like ?)", orgID, "%"+keyword+"%", "%"+keyword+"%").Find(&patients).Error
-	//if getPatientErr != nil {
-	//	return nil, getPatientErr, 0
-	//}
-	//patientIDs := make([]int64, len(patients))
-	//for index, patient := range patients {
-	//	patientIDs[index] = patient.ID
-	//}
-	//
-	//db := readDb.
-	//	Model(&models.DialysisSchedule{}).
-	//	Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
-	//	Preload("TreatmentMode", "status = 1").
-	//	Preload("Prescription", "status = 1 AND user_org_id = ?", orgID).
-	//	Preload("AssessmentBeforeDislysis", "status = 1 AND  user_org_id = ?", orgID).
-	//	Preload("AssessmentAfterDislysis", "status = 1 AND  user_org_id = ?", orgID).
-	//	Preload("MonitoringRecord", "status = 1 AND  user_org_id = ?", orgID).
-	//	Preload("DialysisOrder", "status = 1 AND user_org_id = ?", orgID).
-	//	Preload("MonitorPatients", "status = 1 AND user_org_id = ?", orgID)
-	//db = db.Where("xt_schedule.status = 1 AND patient_id in (?)", patientIDs)
-	//if schedulType > 0 {
-	//	db = db.Where("schedule_type = ?", schedulType)
-	//}
-	//if partitionType > 0 {
-	//	db = db.Joins("inner join xt_device_number as d_n on d_n.id = xt_schedule.bed_id and d_n.zone_id = ? and d_n.status = 1", partitionType)
-	//
-	//}
-	//var schedules []*models.DialysisSchedule
-	//total := int64(0)
-	//err := db.Count(&total).Offset(limit * (page - 1)).Limit(limit).Order("schedule_date desc").Find(&schedules).Error
-	//return schedules, err, total
+//func GetDialysisWatchByKeyword(orgID int64, keyword string, schedulType int64, partitionType int64, page int64, limit int64) (schedules []*models.DialysisSchedule, err error, total int64) {
+//	db := readDb.Model(&models.DialysisSchedule{}).Where("status = 1")
+//
+//	if schedulType > 0 {
+//		db = db.Where("scheudle_type = ?", schedulType)
+//	}
+//
+//	if partitionType > 0 {
+//		db = db.Where("partition_id = ?", partitionType)
+//	}
+//
+//	err = db.Count(&total).Offset(limit * (page - 1)).Limit(limit).Order("schedule_date desc").Find(&schedules).Error
+//	return schedules, err, total
+//}
 
-	db := readDb.Model(&models.DialysisSchedule{}).Where("status = 1")
+func GetDialysisWatchByKeyword(orgID int64, keyword string, schedulType int64, partitionType int64, page int64, limit int64) ([]*models.DialysisSchedule, error, int64) {
+	var patients []*models.Patients
+	getPatientErr := readDb.Model(&models.Patients{}).Where("status = 1 AND user_org_id = ? AND (name like ? OR dialysis_no like ?)", orgID, "%"+keyword+"%", "%"+keyword+"%").Find(&patients).Error
+	if getPatientErr != nil {
+		return nil, getPatientErr, 0
+	}
+	patientIDs := make([]int64, len(patients))
+	for index, patient := range patients {
+		patientIDs[index] = patient.ID
+	}
 
+	db := readDb.
+		Model(&models.DialysisSchedule{}).
+		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+		// Preload("DeviceZone", "status = 1 AND org_id = ?", orgID).
+		Preload("TreatmentMode", "status = 1").
+		Preload("Prescription", "status = 1 AND user_org_id = ?", orgID).
+		Preload("AssessmentBeforeDislysis", "status = 1 AND  user_org_id = ?", orgID).
+		Preload("AssessmentAfterDislysis", "status = 1 AND  user_org_id = ?", orgID).
+		Preload("MonitoringRecord", "status = 1 AND  user_org_id = ?", orgID).
+		Preload("DialysisOrder", "status = 1 AND user_org_id = ?", orgID).
+		Preload("MonitorPatients", "status = 1 AND user_org_id = ?", orgID)
+	db = db.Where("xt_schedule.status = 1 AND patient_id in (?)", patientIDs)
 	if schedulType > 0 {
-		db = db.Where("scheudle_type = ?", schedulType)
+		db = db.Where("schedule_type = ?", schedulType)
 	}
-
 	if partitionType > 0 {
-		db = db.Where("partition_id = ?", partitionType)
+		db = db.Joins("inner join xt_device_number as d_n on d_n.id = xt_schedule.bed_id and d_n.zone_id = ? and d_n.status = 1", partitionType)
+		// db = db.Where("partition_id = ?", partitionType)
 	}
-
-	err = db.Count(&total).Offset(limit * (page - 1)).Limit(limit).Order("schedule_date desc").Find(&schedules).Error
+	var schedules []*models.DialysisSchedule
+	total := int64(0)
+	err := db.Count(&total).Offset(limit * (page - 1)).Limit(limit).Order("schedule_date desc").Find(&schedules).Error
 	return schedules, err, total
 }
 
@@ -1406,6 +1409,13 @@ func FindAllHisProjectById(orgID int64, patient_id int64, record_time int64) (ad
 	return
 }
 
+func GetAllPcPatientListByListSeven(orgID int64) (patients []*MSchedualPatientVMList, err error) {
+
+	err = readDb.Where("user_org_id=? and status=1 and lapseto = 1", orgID).Find(&patients).Error
+
+	return patients, err
+}
+
 func GetAllPcPatientListByList(orgID int64) (patients []*MSchedualPatientVMList, err error) {
 	redis := RedisClient()
 	defer redis.Close()

service/mobile_dialysis_service.go

@@ -407,6 +407,25 @@ func MobileGetSchedualDetailOne(orgID int64, patientID int64, schedualDate int64
 	return &vm, err
 }
 
+// 用户排班信息
+func MobileGetSchedualDetailSix(orgID int64, patientID int64, schedualDate int64) (*MDialysisScheduleVM, error) {
+	var vm MDialysisScheduleVM
+	err := readDb.
+		Table("xt_schedule").
+		// Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+		Where("status = 1 AND user_org_id = ? AND schedule_date = ? AND patient_id = ?", orgID, schedualDate, patientID).
+		First(&vm).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		} else {
+			return nil, err
+		}
+	}
+	return &vm, err
+}
+
 // 用户排班信息
 func MobileGetSchedualDetail(orgID int64, patientID int64, schedualDate int64) (*MDialysisScheduleVM, error) {
 	redis := RedisClient()
@@ -2102,9 +2121,9 @@ func MobileGetDialysisPrescribeByModeId(orgID int64, patientID int64, recordDate
 
 	// cur_date := time.Now().Format("2006-01-02")
 	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
-	fmt.Println("key23323323223323")
+
 	dialysis_prescribe_str, _ := redis.Get(key).Result()
-	fmt.Println("c产杜3323232323232323232", len(dialysis_prescribe_str))
+
 	if len(dialysis_prescribe_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		err := readDb.Model(&models.DialysisPrescription{}).Where("patient_id = ? and user_org_id = ? and status = 1 and record_date = ? AND mode_id = ?", patientID, orgID, recordDate, mode_id).First(&record).Error
 		if err != nil {
@@ -2139,6 +2158,21 @@ func MobileGetDialysisPrescribeByModeId(orgID int64, patientID int64, recordDate
 	}
 }
 
+func MobileGetDialysisPrescribeByModeIdSix(orgID int64, patientID int64, recordDate int64, mode_id int64) (*models.DialysisPrescription, error) {
+	var record models.DialysisPrescription
+
+	err := readDb.Model(&models.DialysisPrescription{}).Where("patient_id = ? and user_org_id = ? and status = 1 and record_date = ? AND mode_id = ?", patientID, orgID, recordDate, mode_id).First(&record).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		} else {
+			return nil, err
+		}
+	}
+	return &record, nil
+
+}
+
 func MobileGetDialysisPrescribeByModeIdOne(orgID int64, patientID int64, recordDate int64) (*models.DialysisPrescription, error) {
 	var record models.DialysisPrescription
 	err := readDb.Model(&models.DialysisPrescription{}).Where("patient_id = ? and user_org_id = ? and status = 1 and record_date = ?", patientID, orgID, recordDate).First(&record).Error
@@ -2500,6 +2534,11 @@ func GetDialysisOrderCount(orgID int64, patient_id int64, recordDate int64) (cou
 	return
 }
 
+func GetDialysisOrderCountOne(orgID int64, patient_id int64, recordDate int64) (count int64, err error) {
+	err = readDb.Model(&models.DialysisOrder{}).Where("dialysis_date>=1640966400 and  dialysis_date <= ? AND status = 1 AND stage = 2 AND user_org_id = ? AND patient_id = ?", recordDate, orgID, patient_id).Count(&count).Error
+	return
+}
+
 func GetFirstDateOfMonth(d time.Time) time.Time {
 	d = d.AddDate(0, 0, -d.Day()+1)
 	return GetZeroTime(d)

service/patient_service.go

@@ -80,6 +80,13 @@ func GetAllPatientList(orgID int64) (patients []*models.Patients, total int64, e
 	return
 }
 
+func GetAllPatientListSix(orgID int64) (patients []*models.MSchedualPatientList, err error) {
+
+	err = XTReadDB().Model(&patients).Where("user_org_id = ? and status = 1", orgID).Find(&patients).Error
+
+	return patients, err
+}
+
 //GetAllPatientList 返回全部患者的列表
 func GetAllPatientListByList(orgID int64) (patients []*models.MSchedualPatientList, err error) {
 	redis := RedisClient()
@@ -120,6 +127,12 @@ func GetAllPatientListByList(orgID int64) (patients []*models.MSchedualPatientLi
 	}
 }
 
+func GetAllDevicetByListSix(orgID int64) (devices []*models.MDeviceNumberForList, err error) {
+
+	err = readDb.Model(&models.MDeviceNumberForList{}).Preload("Zone", "status = 1 AND org_id = ?", orgID).Where("org_id=? and status=1 ", orgID).Find(&devices).Error
+	return devices, err
+}
+
 func GetAllDevicetByList(orgID int64) (devices []*models.MDeviceNumberForList, err error) {
 	redis := RedisClient()
 	defer redis.Close()
@@ -1959,6 +1972,13 @@ func GetDoctorAdviceListFour(orgID int64, patientID int64, advice_type int64, st
 
 }
 
+func GetAllDeviceNumberByListSix(orgID int64) (number []*models.DeviceNumber, err error) {
+
+	err = readDb.Model(&models.DeviceNumber{}).Where("org_id=? and status=1", orgID).Find(&number).Error
+
+	return number, err
+}
+
 func GetAllDeviceNumberByList(orgID int64) (number []*models.DeviceNumber, err error) {
 	redis := RedisClient()
 	defer redis.Close()
@@ -1992,11 +2012,16 @@ func GetAllPrescriptionByListTwo(orgID int64, scheduleDate int64) (prescriptions
 
 	redis := RedisClient()
 	defer redis.Close()
-	key := strconv.FormatInt(orgID, 10) + ":" + ":prescriptions_list_all"
+	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":prescriptions_list_all"
 	prescriptions_list_all, _ := redis.Get(key).Result()
 
 	if len(prescriptions_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Model(&models.DialysisPrescription{}).Where("status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).Find(&prescriptions).Error
+		if scheduleDate > 0 {
+			err = readDb.Model(&models.DialysisPrescription{}).Where("status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).Find(&prescriptions).Error
+		} else {
+			err = readDb.Model(&models.DialysisPrescription{}).Where("status = 1 AND user_org_id = ?", orgID).Find(&prescriptions).Error
+		}
+
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
 				return nil, nil
@@ -2022,11 +2047,16 @@ func GetAllPrescriptionByListTwo(orgID int64, scheduleDate int64) (prescriptions
 func GetAllAssessmentBeforesByListThree(orgID int64, scheduleDate int64) (assessmentBefores []*models.PredialysisEvaluation, err error) {
 	redis := RedisClient()
 	defer redis.Close()
-	key := strconv.FormatInt(orgID, 10) + ":" + ":assessment_befores_list_all"
+	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":assessment_befores_list_all"
 	assessment_befores_list_all, _ := redis.Get(key).Result()
 
 	if len(assessment_befores_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Model(&models.PredialysisEvaluation{}).Where("status = 1 AND user_org_id = ? AND assessment_date = ? ", orgID, scheduleDate).Find(&assessmentBefores).Error
+		if scheduleDate > 0 {
+			err = readDb.Model(&models.PredialysisEvaluation{}).Where("status = 1 AND user_org_id = ? AND assessment_date = ? ", orgID, scheduleDate).Find(&assessmentBefores).Error
+		} else {
+			err = readDb.Model(&models.PredialysisEvaluation{}).Where("status = 1 AND user_org_id = ?", orgID).Find(&assessmentBefores).Error
+		}
+
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
 				return nil, nil
@@ -2052,11 +2082,16 @@ func GetAllAssessmentBeforesByListThree(orgID int64, scheduleDate int64) (assess
 func GetAllDialysisOrdersByListThree(orgID int64, scheduleDate int64) (dialysisOrders []*models.MonitorDialysisOrder, err error) {
 	redis := RedisClient()
 	defer redis.Close()
-	key := strconv.FormatInt(orgID, 10) + ":" + ":dialysis_orders_list_all"
+	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":dialysis_orders_list_all"
 	dialysis_orders_list_all, _ := redis.Get(key).Result()
 
 	if len(dialysis_orders_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Model(&models.MonitorDialysisOrder{}).Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Find(&dialysisOrders).Error
+		if scheduleDate > 0 {
+			err = readDb.Model(&models.MonitorDialysisOrder{}).Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Find(&dialysisOrders).Error
+		} else {
+			err = readDb.Model(&models.MonitorDialysisOrder{}).Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).Where("status = 1 AND user_org_id = ?", orgID).Find(&dialysisOrders).Error
+		}
+
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
 				return nil, nil
@@ -2082,11 +2117,16 @@ func GetAllDialysisOrdersByListThree(orgID int64, scheduleDate int64) (dialysisO
 func GetAllAssessmentAfterDislysisByListThree(orgID int64, scheduleDate int64) (assessmentAfterDislysis []*models.AssessmentAfterDislysis, err error) {
 	redis := RedisClient()
 	defer redis.Close()
-	key := strconv.FormatInt(orgID, 10) + ":" + ":assessment_after_dislysis_list_all"
+	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":assessment_after_dislysis_list_all"
 	assessment_after_dislysis__all, _ := redis.Get(key).Result()
 
 	if len(assessment_after_dislysis__all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Model(&models.AssessmentAfterDislysis{}).Where("status = 1  AND user_org_id = ? AND assessment_date = ?", orgID, scheduleDate).Find(&assessmentAfterDislysis).Error
+		if scheduleDate > 0 {
+			err = readDb.Model(&models.AssessmentAfterDislysis{}).Where("status = 1  AND user_org_id = ? AND assessment_date = ?", orgID, scheduleDate).Find(&assessmentAfterDislysis).Error
+		} else {
+			err = readDb.Model(&models.AssessmentAfterDislysis{}).Where("status = 1  AND user_org_id = ?", orgID).Find(&assessmentAfterDislysis).Error
+		}
+
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
 				return nil, nil
@@ -2113,11 +2153,16 @@ func GetAllMonitorListThree(orgID int64, scheduleDate int64) (monitor []*models.
 
 	redis := RedisClient()
 	defer redis.Close()
-	key := strconv.FormatInt(orgID, 10) + ":" + ":monitor_record_list_all"
+	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":monitor_record_list_all"
 	monitor_record_list_all, _ := redis.Get(key).Result()
 
 	if len(monitor_record_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Model(&models.MonitoringRecord{}).Where("status = 1  AND user_org_id = ? AND  monitoring_date= ?", orgID, scheduleDate).Find(&monitor).Error
+		if scheduleDate > 0 {
+			err = readDb.Model(&models.MonitoringRecord{}).Where("status = 1  AND user_org_id = ? AND  monitoring_date= ?", orgID, scheduleDate).Find(&monitor).Error
+		} else {
+			err = readDb.Model(&models.MonitoringRecord{}).Where("status = 1  AND user_org_id = ?", orgID).Find(&monitor).Error
+		}
+
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
 				return nil, nil
@@ -2170,6 +2215,22 @@ func GetAllPatientListByListThree(orgID int64) (patients []*models.MonitorPatien
 	}
 }
 
+func GetAllPatientListByListSix(orgID int64, keywords string) (patients []*models.MonitorPatients, err error) {
+
+	db := readDb.Model(&models.MonitorPatients{}).Where("status = 1 and lapseto = 1")
+	likeKey := "%" + keywords + "%"
+	if orgID > 0 {
+		db = db.Where("user_org_id = ?", orgID)
+	}
+	if len(keywords) > 0 {
+
+		db = db.Where("name like ?", likeKey)
+	}
+	err = db.Find(&patients).Error
+
+	return patients, err
+}
+
 func GetAllDialysisOrdersByListTwo(orgID int64, scheduleDate int64) (dialysisOrders []*MDialysisOrderVM, err error) {
 	redis := RedisClient()
 	defer redis.Close()
@@ -2427,6 +2488,7 @@ func GetAllTreatModeByList(orgID int64) (treatement []*models.TreatmentMode, err
 	treatment_info_str, _ := redis.Get(key).Result()
 
 	if len(treatment_info_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+
 		err = readDb.Model(&models.TreatmentMode{}).Where("status=1").Find(&treatement).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
@@ -2450,6 +2512,12 @@ func GetAllTreatModeByList(orgID int64) (treatement []*models.TreatmentMode, err
 	}
 }
 
+func GetAllPatientListByListSeven(orgID int64) (patients []*MSchedualPatientVM, err error) {
+
+	err = readDb.Model(&MSchedualPatientVM{}).Where("user_org_id=? and status=1 and lapseto = 1", orgID).Find(&patients).Error
+	return patients, nil
+}
+
 func GetAllPatientListByListTwo(orgID int64) (patients []*MSchedualPatientVM, err error) {
 	redis := RedisClient()
 	defer redis.Close()

service/patientmanage_service.go

@@ -1853,7 +1853,7 @@ func GetHospitalSummaryList(orgid int64, patient_id int64, startime int64, endti
 		db = db.Where("record_date >=?", startime)
 	}
 	if endtime > 0 {
-		db = db.Where("record_date >=?", endtime)
+		db = db.Where("record_date <=?", endtime)
 	}
 	if patient_id > 0 {
 		db = db.Where("patient_id = ?", patient_id)
@@ -1871,11 +1871,11 @@ func GetHospitalSummaryDetail(id int64) (models.XtHospitalSummary, error) {
 
 func UpdateHospital(id int64, summary models.XtHospitalSummary) error {
 
-	err := XTWriteDB().Model(&summary).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"title": summary.Title, "admission_time": summary.AdmissionTime, "discharge_time": summary.DischargeTime, "sick_personnel": summary.SickPersonnel, "xray": summary.Xray, "connecticut": summary.Connecticut, "nuclear_magnetic_resonance": summary.NuclearMagneticResonance, "ultrasound": summary.Ultrasound, "pathology": summary.Pathology, "admitting_diagnosis_id": summary.AdmittingDiagnosisId, "admitting_diagnosis": summary.AdmittingDiagnosis, "discharge_diagnosis_id": summary.DischargeAdviceId, "discharge_diagnosis": summary.DischargeDiagnosis, "diagnosis_admission_id": summary.DiagnosisAdmissionId, "diagnosis_admission": summary.DiagnosisAdmission, "treatment_id": summary.TreatmentId, "treatment": summary.Treatment, "illness_discharge_id": summary.IllnessDischargeId, "illness_discharge": summary.IllnessDischarge, "discharge_advice_id": summary.DischargeAdviceId, "discharge_advice": summary.DischargeAdvice, "mtime": summary.Mtime, "record_time": summary.RecordTime, "dean_id": summary.DeanId, "doctor": summary.Doctor, "record_date": summary.RecordDate}).Error
+	err := XTWriteDB().Model(&summary).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"title": summary.Title, "admission_time": summary.AdmissionTime, "discharge_time": summary.DischargeTime, "sick_personnel": summary.SickPersonnel, "xray": summary.Xray, "connecticut": summary.Connecticut, "nuclear_magnetic_resonance": summary.NuclearMagneticResonance, "ultrasound": summary.Ultrasound, "pathology": summary.Pathology, "admitting_diagnosis_id": summary.AdmittingDiagnosisId, "admitting_diagnosis": summary.AdmittingDiagnosis, "discharge_diagnosis_id": summary.DischargeDiagnosisId, "discharge_diagnosis": summary.DischargeDiagnosis, "diagnosis_admission_id": summary.DiagnosisAdmissionId, "diagnosis_admission": summary.DiagnosisAdmission, "treatment_id": summary.TreatmentId, "treatment": summary.Treatment, "illness_discharge_id": summary.IllnessDischargeId, "illness_discharge": summary.IllnessDischarge, "discharge_advice_id": summary.DischargeAdviceId, "discharge_advice": summary.DischargeAdvice, "mtime": summary.Mtime, "record_time": summary.RecordTime, "dean_id": summary.DeanId, "doctor": summary.Doctor, "record_date": summary.RecordDate}).Error
 	return err
 }
 
-func DeleteHospitalSummary(id int64) error {
-	err := XTWriteDB().Model(models.XtHospitalSummary{}).Where("id = ? and status=1", id).Updates(map[string]interface{}{"status": 0}).Error
+func DeleteHospitalSummary(id []string) error {
+	err := XTWriteDB().Model(models.XtHospitalSummary{}).Where("id in (?) and status=1", id).Updates(map[string]interface{}{"status": 0}).Error
 	return err
 }

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -57,9 +57,16 @@ func GetSchedules(orgID int64, schIDs []string) ([]*ScheduleVM, error) {
 		return nil, err
 	}
 	for _, item := range schedules {
-		dialysis_count, _ := GetDialysisOrderCount(orgID, item.PatientID, item.ScheduleDate)
-		fmt.Println(dialysis_count)
-		item.Patient.TotalDialysis = dialysis_count
+
+		if orgID != 10101 {
+			dialysis_count, _ := GetDialysisOrderCount(orgID, item.PatientID, item.ScheduleDate)
+			item.Patient.TotalDialysis = dialysis_count
+		}
+		if orgID == 10101 {
+			dialysis_count, _ := GetDialysisOrderCountOne(orgID, item.PatientID, item.ScheduleDate)
+			item.Patient.TotalDialysis = dialysis_count
+		}
+
 		fmt.Println(item.Patient.TotalDialysis)
 
 	}
@@ -112,22 +119,27 @@ func GetAllName(orgId int64, appid int64) (list []AdminUserListTwo, err error) {
 	return
 }
 
-func GetPatientCoursesRecords(orgID int64, id int64) (records models.PatientDiseaseCourse, err error) {
+func GetPatientCoursesRecords(orgID int64, id []string) (records []*models.PatientDiseaseCourse, err error) {
 	db := p_service.XTReadDB()
-	err = db.Model(&models.PatientDiseaseCourse{}).Where("org_id = ? and id = ? and status = 1", orgID, id).Find(&records).Error
+	err = db.Model(&models.PatientDiseaseCourse{}).Where("org_id = ? and id in(?) and status = 1", orgID, id).Find(&records).Error
 	return
 }
 
-func FindPatientWithDeviceById(orgID int64, patient_id int64, time int64) (patient models.SchedualPatient2, err error) {
+func FindPatientWithDeviceById(orgID int64, patient_id int64) (patient models.SchedualPatient2, err error) {
 	db := p_service.XTReadDB()
 
 	err = db.Preload("DialysisSchedule", func(db *gorm.DB) *gorm.DB {
 		return db.Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
 			Preload("DeviceZone", "status = 1 AND org_id = ?", orgID).
-			Where("user_org_id = ? AND schedule_date = ? ", orgID, time)
+			Where("user_org_id = ?", orgID)
 	}).Where("user_org_id=? and id = ? and status=1", orgID, patient_id).First(&patient).Error
 	return
 }
+func GetPatientDetail(orgID int64, patient_id int64) (models.XtPatients, error) {
+	patients := models.XtPatients{}
+	err := p_service.XTReadDB().Where("user_org_id = ? and id = ? and status = 1", orgID, patient_id).Find(&patients).Error
+	return patients, err
+}
 
 func GetLastAfterWeight(orgID int64, patientID int64, maxDate int64) (*models.AssessmentAfterDislysis, error) {
 	var record models.AssessmentAfterDislysis
@@ -195,6 +207,11 @@ func GetDialysisOrderCount(orgID int64, patient_id int64, recordDate int64) (cou
 	return
 }
 
+func GetDialysisOrderCountOne(orgID int64, patient_id int64, recordDate int64) (count int64, err error) {
+	err = p_service.XTReadDB().Model(&models.DialysisOrder{}).Where("dialysis_date >=1640966400 and dialysis_date <= ? AND status = 1 AND stage = 2 AND user_org_id = ? AND patient_id = ?", recordDate, orgID, patient_id).Count(&count).Error
+	return
+}
+
 func GetOutStockTotalCountTwo(startime int64, endtime int64, orgid int64) (autoMatic []*models.NewXtAutomaticReduceDetail, err error) {
 
 	err = p_service.XTReadDB().Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.record_time,x.count FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and x.record_time >= ? and x.record_time<=? and `status` = 1)  as b GROUP BY good_id", orgid, startime, endtime).Scan(&autoMatic).Error

service/schedule_service.go

@@ -161,7 +161,16 @@ func GetPointSchedule(orgID, scheduleDate, scheduleWeek, scheduleType, bedId int
 }
 
 func CreateSchedule(m *models.Schedule) error {
-	return writeDb.Model(&models.Schedule{}).Create(&m).Error
+	utx := XTWriteDB().Begin()
+	err := utx.Create(&m).Error
+	utx.Commit()
+	return err
+}
+
+func DeleteScheduleExist(scheduleData int64, user_org_id int64) (models.XtSchedule, error) {
+	schedule := models.XtSchedule{}
+	err := XTWriteDB().Where("schedule_date= ? and user_org_id = ? and status = 1", scheduleData, user_org_id).Updates(map[string]interface{}{"status": 0}).Error
+	return schedule, err
 }
 
 func GetTodayScheduleIsExist(patientid int64, schedudate int64, orgid int64, mode_id int64, schedule_type int64) (*models.XtSchedule, error) {
@@ -193,7 +202,10 @@ func GetSchedule(orgID, id int64) (*models.Schedule, error) {
 }
 
 func UpdateSchedule(m *models.Schedule) error {
-	return writeDb.Model(&models.Schedule{}).Save(&m).Error
+	utx := XTWriteDB().Begin()
+	err := utx.Save(&m).Error
+	utx.Commit()
+	return err
 }
 
 func GetPatientScheduleFormToday(orgId, id, start int64) (schedules []*models.PatientSchedule, err error) {
@@ -996,3 +1008,32 @@ func GetNextWeekPanels(startime int64, endtime int64, orgid int64) (schedule []*
 	}).Find(&schedule).Error
 	return schedule, err
 }
+
+func GetTemplateListByTemplateId(id int64, orgid int64) (list []*models.VmPatientScheduleTemplateItem, err error) {
+
+	err = XTReadDB().Where("template_id =? and org_id = ? and status = 1", id, orgid).Find(&list).Error
+	return list, err
+}
+
+func DeletePatientSchedule(startime int64, endtime int64, org_id int64) (models.XtSchedule, error) {
+
+	schedule := models.XtSchedule{}
+	err := XTWriteDB().Model(&schedule).Where("schedule_date>=? and schedule_date<=? and user_org_id = ? and status = 1", startime, endtime, org_id).Updates(map[string]interface{}{"status": 0}).Error
+	return schedule, err
+}
+
+func GetBedNumberById(id int64, org_id int64) (models.DeviceNumber, error) {
+
+	number := models.DeviceNumber{}
+
+	err := XTReadDB().Where("id = ? and status = 1 and org_id =?", id, org_id).Find(&number).Error
+	return number, err
+}
+
+func CreatePatientSchedule(schedule *models.XtSchedule) error {
+
+	utx := XTWriteDB().Begin()
+	err := utx.Create(&schedule).Error
+	utx.Commit()
+	return err
+}

service/stock_service.go

@@ -1380,7 +1380,12 @@ func FindAllWarehouseOutListOne(orgId int64, page int64, limit int64, startTime
 	}
 	db = db.Count(&total)
 	offset := (page - 1) * limit
-	err = db.Offset(offset).Limit(limit).Order("xt_warehouse_out.ctime desc").Find(&list).Error
+	if orgId == 10191 {
+		err = db.Offset(offset).Limit(limit).Order("xt_warehouse_out.warehouse_out_time desc").Find(&list).Error
+	} else {
+		err = db.Offset(offset).Limit(limit).Order("xt_warehouse_out.ctime desc").Find(&list).Error
+	}
+
 	return list, total, err
 
 }
@@ -1429,7 +1434,12 @@ func FindAllDrugWarehouseOutListOne(orgId int64, page int64, limit int64, startT
 	}
 	db = db.Count(&total)
 	offset := (page - 1) * limit
-	err = db.Offset(offset).Limit(limit).Order("xt_drug_warehouse_out.ctime desc").Find(&list).Error
+	if orgId == 10191 {
+		err = db.Offset(offset).Limit(limit).Order("xt_drug_warehouse_out.warehouse_out_time desc").Find(&list).Error
+	} else {
+		err = db.Offset(offset).Limit(limit).Order("xt_drug_warehouse_out.ctime desc").Find(&list).Error
+	}
+
 	return list, total, err
 
 }