11月8日库存管理

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)

controllers/dialysis_record_api_controller.go

@@ -888,13 +888,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 +986,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

@@ -58,6 +58,7 @@ func DoctorApiRegistRouters() {
 	beego.Router("/api/patient/gethospitalsummaydetail", &DoctorsApiController{}, "Get:GetHospitalSummaryDetail")
 	beego.Router("/api/patient/updatehospitalsummary", &DoctorsApiController{}, "Get:UpdateHospitalSummary")
 	beego.Router("/api/patient/deletehospitalsummary", &DoctorsApiController{}, "Get:DeleteHospitalSummary")
+	beego.Router("/api/patient/getpatientinfo", &DoctorsApiController{}, "Get:GetPatientInfo")
 }
 
 func (c *DoctorsApiController) ScheduleAdvices() {
@@ -1294,8 +1295,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()
@@ -1409,3 +1412,16 @@ func (this *DoctorsApiController) DeleteHospitalSummary() {
 	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/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

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
 }
 

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

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 {

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)

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -112,22 +112,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