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

controllers/base_api_controller.go

@@ -83,7 +83,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10206 //机构id
+		subscibe.OrgId = 10644 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -93,7 +93,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10206 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10644 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 18470 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
@@ -329,7 +329,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10206 //机构id小英9675或4
+		subscibe.OrgId = 10644 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -339,7 +339,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10206 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10644 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 18470 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/dialysis_api_controller.go

@@ -399,6 +399,25 @@ func (c *DialysisApiController) PostPrescription() {
 	//	}
 	//}
 
+	goodList, _ := service.GetMobileGoodList(adminUserInfo.CurrentOrgId)
+
+	var dialysis_dialyszers_id int64
+	var dialysis_strainer_id int64
+	var dialysis_irrigation_id int64
+	if len(goodList) > 0 {
+		for _, item := range goodList {
+			if item.SpecificationName == dialysis_dialyszers {
+				dialysis_dialyszers_id = item.ID
+			}
+			if item.SpecificationName == dialysis_irrigation {
+				dialysis_irrigation_id = item.ID
+			}
+			if item.SpecificationName == dialysis_strainer {
+				dialysis_strainer_id = item.ID
+			}
+		}
+	}
+
 	prescription := models.DialysisPrescription{
 		UserOrgId:                 adminUserInfo.CurrentOrgId,
 		PatientId:                 patient,
@@ -506,6 +525,9 @@ func (c *DialysisApiController) PostPrescription() {
 		BloodAccessPartId:          blood_access_part_id,
 		AnticoagulantWeichiHour:    anticoagulant_weichi_hour,
 		Dialyzate:                  dialyzate,
+		DialysisStrainerId:         dialysis_strainer_id,
+		DialysisIrrigationId:       dialysis_irrigation_id,
+		DialysisDialyszersId:       dialysis_dialyszers_id,
 	}
 
 	//长沙南雅医院，自动生成抗凝剂的临时处方
@@ -1100,6 +1122,25 @@ func (c *DialysisApiController) PostSoulution() {
 		}
 	}
 
+	goodList, _ := service.GetMobileGoodList(adminUserInfo.CurrentOrgId)
+
+	var dialysis_dialyszers_id int64
+	var dialysis_strainer_id int64
+	var dialysis_irrigation_id int64
+	if len(goodList) > 0 {
+		for _, item := range goodList {
+			if item.SpecificationName == dialysis_dialyszers {
+				dialysis_dialyszers_id = item.ID
+			}
+			if item.SpecificationName == dialysis_irrigation {
+				dialysis_irrigation_id = item.ID
+			}
+			if item.SpecificationName == dialysis_strainer {
+				dialysis_strainer_id = item.ID
+			}
+		}
+	}
+
 	prescription := models.DialysisPrescription{
 		UserOrgId:                 adminUserInfo.CurrentOrgId,
 		PatientId:                 patient,
@@ -1209,6 +1250,9 @@ func (c *DialysisApiController) PostSoulution() {
 		BloodAccessPartId:          blood_access_part_id,
 		AnticoagulantWeichiHour:    anticoagulant_weichi_hour,
 		Dialyzate:                  dialyzate,
+		DialysisDialyszersId:       dialysis_dialyszers_id,
+		DialysisIrrigationId:       dialysis_irrigation_id,
+		DialysisStrainerId:         dialysis_strainer_id,
 	}
 
 	if prescription.Anticoagulant == 0 {
@@ -1420,6 +1464,9 @@ func (c *DialysisApiController) PostSoulution() {
 		BloodAccessPartId:          blood_access_part_id,
 		AnticoagulantWeichiHour:    anticoagulant_weichi_hour,
 		Dialyzate:                  dialyzate,
+		DialysisDialyszersId:       dialysis_dialyszers_id,
+		DialysisIrrigationId:       dialysis_irrigation_id,
+		DialysisStrainerId:         dialysis_strainer_id,
 	}
 
 	if solution.Anticoagulant == 0 {
@@ -1799,6 +1846,48 @@ func (c *DialysisApiController) PostDouleCheck() {
 
 			}
 		}
+
+		//针对溪康
+		if adminUserInfo.CurrentOrgId == 10721 {
+
+			adviceInfoList, _ := service.GetHisDoctorAdviceList(adminUserInfo.CurrentOrgId, id, recordDate.Unix())
+			if len(adviceInfoList) > 0 {
+				for _, item := range adviceInfoList {
+
+					service.UpdateHisAdviceList(item.ID, creater)
+					key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":doctor_advices"
+					redis := service.RedisClient()
+					//清空key 值
+					redis.Set(key, "", time.Second)
+					keyTwo := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":advice_list_all"
+					redis.Set(keyTwo, "", time.Second)
+					theTime := time.Now()
+					recordDate := theTime.Format("2006-01-02")
+					keyFour := "scheduals_" + recordDate + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
+					redis.Set(keyFour, "", time.Second)
+					defer redis.Close()
+				}
+			}
+
+			adviceList, _ := service.GetMobileDoctorAdviceList(adminUserInfo.CurrentOrgId, id, recordDate.Unix())
+			if len(adviceList) > 0 {
+				for _, item := range adviceList {
+					service.UpdateAdviceList(item.ID, creater)
+					key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":doctor_advices"
+					redis := service.RedisClient()
+					//清空key 值
+					redis.Set(key, "", time.Second)
+					keyTwo := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":advice_list_all"
+					redis.Set(keyTwo, "", time.Second)
+					theTime := time.Now()
+					recordDate := theTime.Format("2006-01-02")
+					keyFour := "scheduals_" + recordDate + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
+					redis.Set(keyFour, "", time.Second)
+					defer redis.Close()
+				}
+			}
+		}
+
 		redis := service.RedisClient()
 		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":double_check"
 
@@ -1829,6 +1918,48 @@ func (c *DialysisApiController) PostDouleCheck() {
 
 		redis := service.RedisClient()
 		err := service.UpdateDoubleCheck(&doubleCheck)
+
+		//针对溪康
+		if adminUserInfo.CurrentOrgId == 10721 {
+
+			adviceInfoList, _ := service.GetHisDoctorAdviceList(adminUserInfo.CurrentOrgId, id, recordDate.Unix())
+			if len(adviceInfoList) > 0 {
+				for _, item := range adviceInfoList {
+
+					service.UpdateHisAdviceList(item.ID, creater)
+					key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":doctor_advices"
+					redis := service.RedisClient()
+					//清空key 值
+					redis.Set(key, "", time.Second)
+					keyTwo := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":advice_list_all"
+					redis.Set(keyTwo, "", time.Second)
+					theTime := time.Now()
+					recordDate := theTime.Format("2006-01-02")
+					keyFour := "scheduals_" + recordDate + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
+					redis.Set(keyFour, "", time.Second)
+					defer redis.Close()
+				}
+			}
+
+			adviceList, _ := service.GetMobileDoctorAdviceList(adminUserInfo.CurrentOrgId, id, recordDate.Unix())
+			if len(adviceList) > 0 {
+				for _, item := range adviceList {
+					service.UpdateAdviceList(item.ID, creater)
+					key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":doctor_advices"
+					redis := service.RedisClient()
+					//清空key 值
+					redis.Set(key, "", time.Second)
+					keyTwo := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":advice_list_all"
+					redis.Set(keyTwo, "", time.Second)
+					theTime := time.Now()
+					recordDate := theTime.Format("2006-01-02")
+					keyFour := "scheduals_" + recordDate + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
+					redis.Set(keyFour, "", time.Second)
+					defer redis.Close()
+				}
+			}
+		}
+
 		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":double_check"
 
 		keyTwo := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
@@ -2575,7 +2706,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 			service.CreateDialysisFinish(finish)
 		}
 
-		if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10469 || adminUserInfo.CurrentOrgId == 10551 || adminUserInfo.CurrentOrgId == 10579 || adminUserInfo.CurrentOrgId == 10580 || adminUserInfo.CurrentOrgId == 10585 || adminUserInfo.CurrentOrgId == 10344 || adminUserInfo.CurrentOrgId == 10622 || adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10635 || adminUserInfo.CurrentOrgId == 10723 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10727 {
+		if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10469 || adminUserInfo.CurrentOrgId == 10551 || adminUserInfo.CurrentOrgId == 10579 || adminUserInfo.CurrentOrgId == 10580 || adminUserInfo.CurrentOrgId == 10585 || adminUserInfo.CurrentOrgId == 10344 || adminUserInfo.CurrentOrgId == 10622 || adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10635 || adminUserInfo.CurrentOrgId == 10723 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10727 || adminUserInfo.CurrentOrgId == 10726 {
 			var dewater_amount float64
 			dewater_amount = 0
 			if dry_weight > 0 {
@@ -3180,7 +3311,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		}
 
 		//针对孝昌康桥超滤率计算问题
-		if adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10635 || adminUserInfo.CurrentOrgId == 10723 || adminUserInfo.CurrentOrgId == 10721 {
+		if adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10635 || adminUserInfo.CurrentOrgId == 10723 || adminUserInfo.CurrentOrgId == 10721 || adminUserInfo.CurrentOrgId == 10726 {
 			if assessmentBeforeDislysis.ID == 0 {
 				dialysisPrescribeOne, _ := service.MobileGetDialysisPrescribeOne(adminUserInfo.CurrentOrgId, patient, recordDate.Unix())
 				if dialysisPrescribeOne.ID > 0 && assessmentBeforeDislysis.ID > 0 {
@@ -7987,7 +8118,10 @@ func (this *DialysisApiController) GetPatientBefor() {
 
 	patientBefor, _ := service.GetPatientBefor(patient_id, startdateunix, user_org_id)
 
+	prescription, _ := service.GetDialysisPrescribeOneList(patient_id, startdateunix, user_org_id)
+
 	this.ServeSuccessJSON(map[string]interface{}{
 		"patientBefor": patientBefor,
+		"prescription": prescription,
 	})
 }

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -502,8 +502,15 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 					service.UpdateAddSigleRecord(prescriptionTwenty.ID, newprescribe.TargetUltrafiltration)
 				}
 			} else {
-				//插入透析处方
-				service.AddSigleRecord(&newprescribe)
+				//避免插入失败问题
+				if adminUserInfo.Org.Id == 10726 || adminUserInfo.Org.Id == 10121 {
+					//插入透析处方
+					service.AddSigleRecordOne(&newprescribe)
+				} else {
+					//插入透析处方
+					service.AddSigleRecord(&newprescribe)
+				}
+
 			}
 
 			//记录日志

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1053,6 +1053,47 @@ func (c *DialysisAPIController) PostDoubleCheck() {
 
 		}
 
+		//针对溪康
+		if adminUserInfo.Org.Id == 10721 {
+
+			adviceInfoList, _ := service.GetHisDoctorAdviceList(adminUserInfo.Org.Id, id, recordDate.Unix())
+			if len(adviceInfoList) > 0 {
+				for _, item := range adviceInfoList {
+
+					service.UpdateHisAdviceList(item.ID, creater)
+					key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":doctor_advices"
+					redis := service.RedisClient()
+					//清空key 值
+					redis.Set(key, "", time.Second)
+					keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":advice_list_all"
+					redis.Set(keyTwo, "", time.Second)
+					theTime := time.Now()
+					recordDate := theTime.Format("2006-01-02")
+					keyFour := "scheduals_" + recordDate + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+					redis.Set(keyFour, "", time.Second)
+					defer redis.Close()
+				}
+			}
+
+			adviceList, _ := service.GetMobileDoctorAdviceList(adminUserInfo.Org.Id, id, recordDate.Unix())
+			if len(adviceList) > 0 {
+				for _, item := range adviceList {
+					service.UpdateAdviceList(item.ID, creater)
+					key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":doctor_advices"
+					redis := service.RedisClient()
+					//清空key 值
+					redis.Set(key, "", time.Second)
+					keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":advice_list_all"
+					redis.Set(keyTwo, "", time.Second)
+					theTime := time.Now()
+					recordDate := theTime.Format("2006-01-02")
+					keyFour := "scheduals_" + recordDate + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+					redis.Set(keyFour, "", time.Second)
+					defer redis.Close()
+				}
+			}
+		}
+
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":double_check"
 		redis := service.RedisClient()
 		//清空key 值
@@ -1112,6 +1153,48 @@ func (c *DialysisAPIController) PostDoubleCheck() {
 				}
 			}
 		}
+
+		//针对溪康
+		if adminUserInfo.Org.Id == 10721 {
+
+			adviceInfoList, _ := service.GetHisDoctorAdviceList(adminUserInfo.Org.Id, id, recordDate.Unix())
+			if len(adviceInfoList) > 0 {
+				for _, item := range adviceInfoList {
+
+					service.UpdateHisAdviceList(item.ID, creater)
+					key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":doctor_advices"
+					redis := service.RedisClient()
+					//清空key 值
+					redis.Set(key, "", time.Second)
+					keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":advice_list_all"
+					redis.Set(keyTwo, "", time.Second)
+					theTime := time.Now()
+					recordDate := theTime.Format("2006-01-02")
+					keyFour := "scheduals_" + recordDate + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+					redis.Set(keyFour, "", time.Second)
+					defer redis.Close()
+				}
+			}
+
+			adviceList, _ := service.GetMobileDoctorAdviceList(adminUserInfo.Org.Id, id, recordDate.Unix())
+			if len(adviceList) > 0 {
+				for _, item := range adviceList {
+					service.UpdateAdviceList(item.ID, creater)
+					key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":doctor_advices"
+					redis := service.RedisClient()
+					//清空key 值
+					redis.Set(key, "", time.Second)
+					keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":advice_list_all"
+					redis.Set(keyTwo, "", time.Second)
+					theTime := time.Now()
+					recordDate := theTime.Format("2006-01-02")
+					keyFour := "scheduals_" + recordDate + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+					redis.Set(keyFour, "", time.Second)
+					defer redis.Close()
+				}
+			}
+		}
+
 		err := service.UpdateDoubleCheck(&doubleCheck)
 
 		//针对长沙南雅
@@ -2046,6 +2129,25 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		service.ModifyScheduleMode(mode_id, id, recordDate.Unix(), adminUserInfo.Org.Id, str)
 	}
 
+	goodList, _ := service.GetMobileGoodList(adminUserInfo.Org.Id)
+
+	var dialysis_dialyszers_id int64
+	var dialysis_strainer_id int64
+	var dialysis_irrigation_id int64
+	if len(goodList) > 0 {
+		for _, item := range goodList {
+			if item.SpecificationName == dialysis_dialyszers {
+				dialysis_dialyszers_id = item.ID
+			}
+			if item.SpecificationName == dialysis_irrigation {
+				dialysis_irrigation_id = item.ID
+			}
+			if item.SpecificationName == dialysis_strainer {
+				dialysis_strainer_id = item.ID
+			}
+		}
+	}
+
 	//TODO 需要根据角色去判断
 
 	prescription := models.DialysisPrescription{
@@ -2157,6 +2259,9 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		BloodAccessPartId:          blood_access_part_id,
 		AnticoagulantWeichiHour:    anticoagulant_weichi_hour,
 		Dialyzate:                  dialyzate,
+		DialysisDialyszersId:       dialysis_dialyszers_id,
+		DialysisIrrigationId:       dialysis_irrigation_id,
+		DialysisStrainerId:         dialysis_strainer_id,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -4150,6 +4255,25 @@ func (c *DialysisAPIController) PostSolution() {
 		}
 	}
 
+	goodList, _ := service.GetMobileGoodList(adminUserInfo.Org.Id)
+
+	var dialysis_dialyszers_id int64
+	var dialysis_strainer_id int64
+	var dialysis_irrigation_id int64
+	if len(goodList) > 0 {
+		for _, item := range goodList {
+			if item.SpecificationName == dialysis_dialyszers {
+				dialysis_dialyszers_id = item.ID
+			}
+			if item.SpecificationName == dialysis_irrigation {
+				dialysis_irrigation_id = item.ID
+			}
+			if item.SpecificationName == dialysis_strainer {
+				dialysis_strainer_id = item.ID
+			}
+		}
+	}
+
 	prescription := models.DialysisPrescription{
 
 		UserOrgId:          adminUserInfo.Org.Id,
@@ -4260,6 +4384,9 @@ func (c *DialysisAPIController) PostSolution() {
 		BloodAccessPartId:          blood_access_part_id,
 		AnticoagulantWeichiHour:    anticoagulant_weichi_hour,
 		Dialyzate:                  dialyzate,
+		DialysisDialyszersId:       dialysis_dialyszers_id,
+		DialysisIrrigationId:       dialysis_irrigation_id,
+		DialysisStrainerId:         dialysis_strainer_id,
 	}
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
@@ -4389,6 +4516,9 @@ func (c *DialysisAPIController) PostSolution() {
 		BloodAccessPartId:          blood_access_part_id,
 		AnticoagulantWeichiHour:    anticoagulant_weichi_hour,
 		Dialyzate:                  dialyzate,
+		DialysisDialyszersId:       dialysis_dialyszers_id,
+		DialysisIrrigationId:       dialysis_irrigation_id,
+		DialysisStrainerId:         dialysis_strainer_id,
 	}
 
 	//针对河间咸的
@@ -11066,21 +11196,33 @@ func (c *DialysisAPIController) ExMobileChangeSch() {
 
 	err := service.UpdateScheduleThree(sch, sch_two)
 
-	order, _ := service.GetOneDialysisOrderOne(sch.ScheduleDate, sch.PatientId, sch.UserOrgId)
+	order, _ := service.GetOneDialysisOrderOne(sch.UserOrgId, sch.ScheduleDate, sch.PatientId)
 	if order.ID > 0 {
-		//查询该患者的排班机位
-		pSchedule, _ := service.GetPscheduleDate(sch.ScheduleDate, sch.PatientId, sch.UserOrgId)
-		service.UpdateDialysiOrderByPatientId(id_two, pSchedule.ScheduleType, pSchedule.PartitionId, pSchedule.BedId)
+		scheduleObj, _ := service.GetPatientScheduleByPatientId(sch.PatientId, sch.UserOrgId, sch.ScheduleDate)
+		service.UpdateDialysiOrderByPatientId(order.ID, scheduleObj.ScheduleType, scheduleObj.PartitionId, scheduleObj.BedId)
+		redis := service.RedisClient()
+		key := strconv.FormatInt(sch.UserOrgId, 10) + ":" + strconv.FormatInt(sch.PatientId, 10) + ":" + strconv.FormatInt(sch.ScheduleDate, 10) + ":dialysis_order"
+		redis.Set(key, "", time.Second)
+		keyOne := strconv.FormatInt(sch.UserOrgId, 10) + ":" + strconv.FormatInt(sch.ScheduleDate, 10) + ":dialysis_orders_list_all"
+
+		//清空key 值
+		redis.Set(keyOne, "", time.Second)
+
+	}
+
+	orderOne, _ := service.GetOneDialysisOrderOne(sch_two.UserOrgId, sch_two.ScheduleDate, sch_two.PatientId)
+	if orderOne.ID > 0 {
+		scheduleObj, _ := service.GetPatientScheduleByPatientId(sch_two.PatientId, sch_two.UserOrgId, sch_two.ScheduleDate)
+		service.UpdateDialysiOrderByPatientId(orderOne.ID, scheduleObj.ScheduleType, scheduleObj.PartitionId, scheduleObj.BedId)
 		redis := service.RedisClient()
 		key := strconv.FormatInt(sch_two.UserOrgId, 10) + ":" + strconv.FormatInt(sch_two.PatientId, 10) + ":" + strconv.FormatInt(sch_two.ScheduleDate, 10) + ":dialysis_order"
 		redis.Set(key, "", time.Second)
 		keyOne := strconv.FormatInt(sch_two.UserOrgId, 10) + ":" + strconv.FormatInt(sch_two.ScheduleDate, 10) + ":dialysis_orders_list_all"
-
 		//清空key 值
 		redis.Set(keyOne, "", time.Second)
-		//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientDialysisOrderOne)
-		//return
+
 	}
+
 	if err == nil {
 
 		//去除当天患者排班中重复数据，保留最后一条数据
@@ -11123,21 +11265,6 @@ func (c *DialysisAPIController) MobileCoverSch() {
 	}
 	sch_two, _ := service.GetScheduleTen(c.GetMobileAdminUserInfo().Org.Id, id_two)
 
-	order, _ := service.GetOneDialysisOrderOne(sch.ScheduleDate, sch.PatientId, sch.UserOrgId)
-	if order.ID > 0 {
-
-		service.UpdateDialysiOrderByPatientId(id_two, sch_two.ScheduleType, sch_two.PartitionId, sch_two.BedId)
-		redis := service.RedisClient()
-		key := strconv.FormatInt(sch_two.UserOrgId, 10) + ":" + strconv.FormatInt(sch_two.PatientId, 10) + ":" + strconv.FormatInt(sch_two.ScheduleDate, 10) + ":dialysis_order"
-		redis.Set(key, "", time.Second)
-		keyOne := strconv.FormatInt(sch_two.UserOrgId, 10) + ":" + strconv.FormatInt(sch_two.ScheduleDate, 10) + ":dialysis_orders_list_all"
-
-		//清空key 值
-		redis.Set(keyOne, "", time.Second)
-
-		//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientDialysisOrderTwo)
-		//return
-	}
 	//替换者和被替换的排班日期不是同一天，则进行一个患者一天不能有多个排班提醒
 	if sch.ScheduleDate != sch_two.ScheduleDate && sch.PatientId != sch_two.PatientId {
 		count, _ := service.GetScheduleCountByDate(c.GetMobileAdminUserInfo().Org.Id, sch_two.ScheduleDate, sch.PatientId)
@@ -11160,6 +11287,34 @@ func (c *DialysisAPIController) MobileCoverSch() {
 	//生成新的排班
 	if err == nil {
 		err2 := service.SaveSch(&new_sch)
+
+		order, _ := service.GetOneDialysisOrderOne(sch.UserOrgId, sch.ScheduleDate, sch.PatientId)
+		if order.ID > 0 {
+			scheduleObj, _ := service.GetPatientScheduleByPatientId(sch.PatientId, sch.UserOrgId, sch.ScheduleDate)
+			service.UpdateDialysiOrderByPatientId(order.ID, scheduleObj.ScheduleType, scheduleObj.PartitionId, scheduleObj.BedId)
+			redis := service.RedisClient()
+			key := strconv.FormatInt(sch.UserOrgId, 10) + ":" + strconv.FormatInt(sch.PatientId, 10) + ":" + strconv.FormatInt(sch.ScheduleDate, 10) + ":dialysis_order"
+			redis.Set(key, "", time.Second)
+			keyOne := strconv.FormatInt(sch.UserOrgId, 10) + ":" + strconv.FormatInt(sch.ScheduleDate, 10) + ":dialysis_orders_list_all"
+
+			//清空key 值
+			redis.Set(keyOne, "", time.Second)
+
+		}
+
+		orderOne, _ := service.GetOneDialysisOrderOne(sch_two.UserOrgId, sch_two.ScheduleDate, sch_two.PatientId)
+		if orderOne.ID > 0 {
+			scheduleObj, _ := service.GetPatientScheduleByPatientId(sch_two.PatientId, sch_two.UserOrgId, sch_two.ScheduleDate)
+			service.UpdateDialysiOrderByPatientId(orderOne.ID, scheduleObj.ScheduleType, scheduleObj.PartitionId, scheduleObj.BedId)
+			redis := service.RedisClient()
+			key := strconv.FormatInt(sch_two.UserOrgId, 10) + ":" + strconv.FormatInt(sch_two.PatientId, 10) + ":" + strconv.FormatInt(sch_two.ScheduleDate, 10) + ":dialysis_order"
+			redis.Set(key, "", time.Second)
+			keyOne := strconv.FormatInt(sch_two.UserOrgId, 10) + ":" + strconv.FormatInt(sch_two.ScheduleDate, 10) + ":dialysis_orders_list_all"
+			//清空key 值
+			redis.Set(keyOne, "", time.Second)
+
+		}
+
 		if err2 == nil {
 			//去除当天患者排班中重复数据，保留最后一条数据
 			service.UpdateRepeatSchStatus(sch.UserOrgId, sch.ScheduleDate)

controllers/mobile_api_controllers/patient_api_controller.go

@@ -4207,7 +4207,7 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 	}
 
 	//针对孝昌康桥超滤率计算问题
-	if adminUserInfo.Org.Id == 10702 || adminUserInfo.Org.Id == 10635 || adminUserInfo.Org.Id == 10721 {
+	if adminUserInfo.Org.Id == 10702 || adminUserInfo.Org.Id == 10635 || adminUserInfo.Org.Id == 10721 || adminUserInfo.Org.Id == 10726 {
 		if evaluation.ID == 0 {
 			dialysisPrescribeOne, _ := service.MobileGetDialysisPrescribeOne(adminUserInfo.Org.Id, id, theAssessmentDateTime)
 			if dialysisPrescribeOne.ID > 0 && evaluation.ID > 0 {

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -1327,6 +1327,8 @@ func (c *StaffScheduleApiController) ChangeScheduleType() {
 
 }
 func (c *StaffScheduleApiController) ChangeScheduleBed() {
+
+	fmt.Println("hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh")
 	schedule_type, _ := c.GetInt64("schedule_type")
 	schedule_date, _ := c.GetInt64("schedule_date")
 	patient_id, _ := c.GetInt64("patient_id")
@@ -1444,6 +1446,22 @@ func (c *StaffScheduleApiController) ChangeScheduleBed() {
 			}
 		}
 
+		orderOne, _ := service.GetOneDialysisOrderOne(org_id, schedule_date, patient_id)
+
+		fmt.Println("orderOne[[[[[[[[[[[[[[[[[[[[[[[", orderOne)
+		if orderOne.ID > 0 {
+			scheduleObj, _ := service.GetPatientScheduleByPatientId(patient_id, org_id, schedule_date)
+			service.UpdateDialysiOrderByPatientId(orderOne.ID, scheduleObj.ScheduleType, scheduleObj.PartitionId, scheduleObj.BedId)
+			redis := service.RedisClient()
+			key := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(schedule_date, 10) + ":dialysis_order"
+			redis.Set(key, "", time.Second)
+			keyOne := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedule_date, 10) + ":dialysis_orders_list_all"
+
+			//清空key 值
+			redis.Set(keyOne, "", time.Second)
+
+		}
+
 		//if org_id == 10206 || org_id == 10344 {
 		//	hisAdvice, _ := service.GetHisDoctorAdviceListTwenty(scheduleToday.PatientId, scheduleToday.ScheduleDate, org_id)
 		//	project, _ := service.GetHisPrescriptionProjectList(scheduleToday.PatientId, scheduleToday.ScheduleDate, org_id)
@@ -1494,6 +1512,20 @@ func (c *StaffScheduleApiController) ChangeScheduleBed() {
 		var err error
 		err = service.CreateSchedule(&xtSchedule, id)
 		service.UpdateRepeatSchStatus(org_id, schedule_date)
+
+		order, _ := service.GetOneDialysisOrderOne(org_id, schedule_date, patient_id)
+		if order.ID > 0 {
+			scheduleObj, _ := service.GetPatientScheduleByPatientId(patient_id, org_id, schedule_date)
+			service.UpdateDialysiOrderByPatientId(order.ID, scheduleObj.ScheduleType, scheduleObj.PartitionId, scheduleObj.BedId)
+			redis := service.RedisClient()
+			key := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(schedule_date, 10) + ":dialysis_order"
+			redis.Set(key, "", time.Second)
+			keyOne := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedule_date, 10) + ":dialysis_orders_list_all"
+
+			//清空key 值
+			redis.Set(keyOne, "", time.Second)
+
+		}
 		//记录日志
 		byterequest, _ := json.Marshal(schedule)
 		scheduleLog := models.XtScheduleLog{

controllers/pharmacy_controller.go

@@ -212,8 +212,22 @@ func (this *PharmacyController) IssuedDrug() {
 			flist = append(flist, patientlist)
 		}
 	}
+
+	listTwo, _ := service.GetTodayAdviceCountTwo(stime, etime, orgid, 1)
+
+	var vlist []*models.HisDoctorAdviceInfo
+	if len(listTwo) > 0 {
+		for _, item := range listTwo {
+			//查询该患者是否有排班
+			scheduleList, _ := service.GetPatientAdviceScheduleByPatient(item.PatientId, item.UserOrgId, item.AdviceDate)
+			if len(scheduleList) == 0 {
+				vlist = append(vlist, item)
+			}
+		}
+	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"list": flist,
+		"list":    flist,
+		"listTwo": vlist,
 	})
 
 	//if orgid != 10164 && orgid == 3877 && orgid != 10188 && orgid != 10217 && orgid != 9671 && orgid != 10387 && orgid != 10375 && orgid != 10480 && orgid == 10344 {
@@ -275,7 +289,7 @@ func (this *PharmacyController) WaitingDrug() {
 	var patientsId []int64
 
 	patient, _ := service.GetPatientKeyWord(keyword, orgid)
-	fmt.Println("hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh", patient)
+
 	if len(patient) > 0 {
 		for _, item := range patient {
 			patientsId = append(patientsId, item.ID)
@@ -292,6 +306,21 @@ func (this *PharmacyController) WaitingDrug() {
 
 	list, _ := service.GetTodayAdviceCountOne(stime, etime, orgid, 0, ids)
 
+	listTwo, _ := service.GetTodayAdviceCountTwo(stime, etime, orgid, 0)
+
+	var vlist []*models.HisDoctorAdviceInfo
+	if len(listTwo) > 0 {
+		for _, item := range listTwo {
+			//查询该患者是否有排班
+			scheduleList, _ := service.GetPatientAdviceScheduleByPatient(item.PatientId, item.UserOrgId, item.AdviceDate)
+			if len(scheduleList) == 0 {
+				vlist = append(vlist, item)
+			}
+		}
+	}
+
+	patientList, _ := service.GetAllpatient(orgid)
+
 	var flist []models.TmpPatientOne
 	if len(list) > 0 {
 		for _, item := range list {
@@ -301,8 +330,10 @@ func (this *PharmacyController) WaitingDrug() {
 	}
 	baseList, _ := service.GetAllBaseDrugListTwo(orgid)
 	this.ServeSuccessJSON(map[string]interface{}{
-		"list":     flist,
-		"baseList": baseList,
+		"list":        flist,
+		"baseList":    baseList,
+		"listTwo":     vlist,
+		"patientList": patientList,
 	})
 	return
 

controllers/schedule_api_controller.go

@@ -125,18 +125,29 @@ func (c *ScheduleApiController) CoverSch() {
 	//}
 	order, _ := service.GetOneDialysisOrderOne(sch.ScheduleDate, sch.PatientId, sch.UserOrgId)
 	if order.ID > 0 {
+		scheduleObj, _ := service.GetPatientScheduleByPatientId(sch.PatientId, sch.UserOrgId, sch.ScheduleDate)
+		service.UpdateDialysiOrderByPatientId(order.ID, scheduleObj.ScheduleType, scheduleObj.PartitionId, scheduleObj.BedId)
+		redis := service.RedisClient()
+		key := strconv.FormatInt(sch.UserOrgId, 10) + ":" + strconv.FormatInt(sch.PatientId, 10) + ":" + strconv.FormatInt(sch.ScheduleDate, 10) + ":dialysis_order"
+		redis.Set(key, "", time.Second)
+		keyOne := strconv.FormatInt(sch.UserOrgId, 10) + ":" + strconv.FormatInt(sch.ScheduleDate, 10) + ":dialysis_orders_list_all"
+
+		//清空key 值
+		redis.Set(keyOne, "", time.Second)
+
+	}
 
-		service.UpdateDialysiOrderByPatientId(id_two, sch_two.ScheduleType, sch_two.PartitionId, sch_two.BedId)
+	orderOne, _ := service.GetOneDialysisOrderOne(sch_two.ScheduleDate, sch_two.PatientId, sch_two.UserOrgId)
+	if orderOne.ID > 0 {
+		scheduleObj, _ := service.GetPatientScheduleByPatientId(sch_two.PatientId, sch_two.UserOrgId, sch_two.ScheduleDate)
+		service.UpdateDialysiOrderByPatientId(order.ID, scheduleObj.ScheduleType, scheduleObj.PartitionId, scheduleObj.BedId)
 		redis := service.RedisClient()
 		key := strconv.FormatInt(sch_two.UserOrgId, 10) + ":" + strconv.FormatInt(sch_two.PatientId, 10) + ":" + strconv.FormatInt(sch_two.ScheduleDate, 10) + ":dialysis_order"
 		redis.Set(key, "", time.Second)
 		keyOne := strconv.FormatInt(sch_two.UserOrgId, 10) + ":" + strconv.FormatInt(sch_two.ScheduleDate, 10) + ":dialysis_orders_list_all"
-
 		//清空key 值
 		redis.Set(keyOne, "", time.Second)
 
-		//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientDialysisOrderTwo)
-		//return
 	}
 	//替换者和被替换的排班日期不是同一天，则进行一个患者一天不能有多个排班提醒
 	if sch.ScheduleDate != sch_two.ScheduleDate && sch.PatientId != sch_two.PatientId {
@@ -208,11 +219,29 @@ func (c *ScheduleApiController) ExchangeSch() {
 
 	err := service.UpdateScheduleThree(sch, sch_two)
 
-	order, _ := service.GetOneDialysisOrderOne(sch.ScheduleDate, sch.PatientId, sch.UserOrgId)
+	fmt.Println("id_one======================", sch.PatientId)
+	fmt.Println("id_one======================", sch_two.PatientId)
+	order, _ := service.GetOneDialysisOrderOne(sch.UserOrgId, sch.ScheduleDate, sch.PatientId)
 	if order.ID > 0 {
 		//查询该患者的排班机位
 		pSchedule, _ := service.GetPscheduleDate(sch.ScheduleDate, sch.PatientId, sch.UserOrgId)
-		service.UpdateDialysiOrderByPatientId(id_two, pSchedule.ScheduleType, pSchedule.PartitionId, pSchedule.BedId)
+		service.UpdateDialysiOrderByPatientId(order.ID, pSchedule.ScheduleType, pSchedule.PartitionId, pSchedule.BedId)
+		redis := service.RedisClient()
+		key := strconv.FormatInt(sch.UserOrgId, 10) + ":" + strconv.FormatInt(sch.PatientId, 10) + ":" + strconv.FormatInt(sch.ScheduleDate, 10) + ":dialysis_order"
+		redis.Set(key, "", time.Second)
+		keyOne := strconv.FormatInt(sch.UserOrgId, 10) + ":" + strconv.FormatInt(sch.ScheduleDate, 10) + ":dialysis_orders_list_all"
+
+		//清空key 值
+		redis.Set(keyOne, "", time.Second)
+		//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientDialysisOrderOne)
+		//return
+	}
+
+	orderOne, _ := service.GetOneDialysisOrderOne(sch_two.UserOrgId, sch_two.ScheduleDate, sch_two.PatientId)
+	if orderOne.ID > 0 {
+		//查询该患者的排班机位
+		pSchedule, _ := service.GetPscheduleDate(sch_two.ScheduleDate, sch_two.PatientId, sch_two.UserOrgId)
+		service.UpdateDialysiOrderByPatientId(orderOne.ID, pSchedule.ScheduleType, pSchedule.PartitionId, pSchedule.BedId)
 		redis := service.RedisClient()
 		key := strconv.FormatInt(sch_two.UserOrgId, 10) + ":" + strconv.FormatInt(sch_two.PatientId, 10) + ":" + strconv.FormatInt(sch_two.ScheduleDate, 10) + ":dialysis_order"
 		redis.Set(key, "", time.Second)
@@ -1736,7 +1765,6 @@ func (c *ScheduleApiController) CreateScheduleTwo() {
 	tm := time.Unix(int64(schedule_two.ScheduleDate), 0)
 	timeStr := tm.Format(timeTemplate)
 	if timeNow > timeStr {
-		fmt.Println("寄哪里地方")
 		utils.ErrorLog(timeNow)
 		utils.ErrorLog(timeStr)
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCantSetScheduleBeforeNow)
@@ -1955,16 +1983,19 @@ func (c *ScheduleApiController) CreateScheduleTwo() {
 
 	//查询上机床位号 更改床位号
 	order, err := service.GetOneDialysisOrderOne(adminINfo.CurrentOrgId, schedule_two.ScheduleDate, schedule_two.PatientId)
-	fmt.Println("errw222222222222222222", order.ID)
+
+	scheduleObj, _ := service.GetPatientScheduleByPatientId(patientID, adminUserInfo.CurrentOrgId, schedule_two.ScheduleDate)
 	if order.ID > 0 {
-		service.UpdateDialysiOrderByPatientId(order.ID, schedule.ScheduleType, schedule.PartitionId, order.BedID)
+		service.UpdateDialysiOrderByPatientId(order.ID, scheduleObj.ScheduleType, scheduleObj.PartitionId, scheduleObj.BedId)
+
 		redis := service.RedisClient()
 		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":dialysis_order"
 		redis.Set(key, "", time.Second)
 		keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":dialysis_orders_list_all"
-
 		//清空key 值
 		redis.Set(keyOne, "", time.Second)
+		keySix := "scheduals_" + timeNow + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
+		redis.Set(keySix, "", time.Second)
 
 	}
 

controllers/sign_api_controller.go

@@ -1261,10 +1261,39 @@ func (this *SignApiController) ToAutoDiagnose() {
 	//	service.UpdasteGoodWarehouseInfoByGood(item.ID, item.PackingPrice, item.OrgId)
 	//}
 
-	list, _ := service.GetAllDialysisPrescription(29190)
+	//list, _ := service.GetAllDialysisPrescription(29190)
+	//
+	//for _, item := range list {
+	//	service.UpdateSchedulePrescrition(item.PatientId, item.RecordDate, item.UserOrgId, item.ModeId)
+	//}
 
-	for _, item := range list {
-		service.UpdateSchedulePrescrition(item.PatientId, item.RecordDate, item.UserOrgId, item.ModeId)
+	//list, _ := service.GetPatientLapseList()
+	//
+	//fmt.Println(list)
+	//if len(list) > 0 {
+	//	for _, items := range list {
+	//		schedulelist, _ := service.GetPatientScheduleListByItem(items.ID)
+	//		if len(schedulelist) < 2 {
+	//			for _, it := range schedulelist {
+	//				orderList, _ := service.GetAllDialysisOrder(it.PatientId, 1731254400, 1731254400)
+	//				for _, item := range orderList {
+	//					schedule, _ := service.GetLastScheduleByUserOrg(item.PatientId, item.DialysisDate, item.UserOrgId, item.BedId, item.ZoneId, item.SchedualType)
+	//					prescribeOne, _ := service.GetDialysisPrescribeOne(item.UserOrgId, item.PatientId, item.DialysisDate)
+	//					service.UpdateScheduleByOrder(item.PatientId, item.DialysisDate, item.UserOrgId, item.BedId, item.ZoneId, item.SchedualType, schedule.ID, prescribeOne.ModeId)
+	//				}
+	//
+	//			}
+	//		}
+	//	}
+	//}
+
+	adviceList, _ := service.GetHisDoctorAdviceNoCheck(10721)
+
+	if len(adviceList) > 0 {
+		for _, item := range adviceList {
+			checkObj, _ := service.GetDobuleCheckOne(item.UserOrgId, item.AdviceDate, item.PatientId)
+			service.UpdateHisAdvice(item.PatientId, item.AdviceDate, item.UserOrgId, checkObj.Creater, checkObj.CheckDate)
+		}
 	}
 
 	this.ServeSuccessJSON(map[string]interface{}{

models/his_models.go

@@ -276,6 +276,7 @@ type HisDoctorAdviceInfo struct {
 	YbSyncStatus          int64                  `gorm:"column:yb_sync_status" json:"yb_sync_status" form:"yb_sync_status"`
 	DrugCode              string                 `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
 	IsUpload              int64                  `gorm:"column:is_upload" json:"is_upload" form:"is_upload"`
+	Patient               Patients               `gorm:"ForeignKey:ID;AssociationForeignKey:PatientId" json:"patient"`
 }
 
 func (HisDoctorAdviceInfo) TableName() string {

models/patient_models.go

@@ -386,10 +386,9 @@ type DialysisPrescription struct {
 	BloodAccessPartId          string        `gorm:"column:blood_access_part_id" json:"blood_access_part_id" form:"blood_access_part_id"`
 	AnticoagulantWeichiHour    string        `gorm:"column:anticoagulant_weichi_hour" json:"anticoagulant_weichi_hour" form:"anticoagulant_weichi_hour"`
 	Dialyzate                  string        `gorm:"column:dialyzate" json:"dialyzate" form:"dialyzate"`
-
-	DialysisDialyszersId int64 `gorm:"column:dialysis_dialyszers_id" json:"dialysis_dialyszers_id" form:"dialysis_dialyszers_id"`
-	DialysisStrainerId   int64 `gorm:"column:dialysis_strainer_id" json:"dialysis_strainer_id" form:"dialysis_strainer_id"`
-	DialysisIrrigationId int64 `gorm:"column:dialysis_irrigation_id" json:"dialysis_irrigation_id" form:"dialysis_irrigation_id"`
+	DialysisDialyszersId       int64         `gorm:"column:dialysis_dialyszers_id" json:"dialysis_dialyszers_id" form:"dialysis_dialyszers_id"`
+	DialysisStrainerId         int64         `gorm:"column:dialysis_strainer_id" json:"dialysis_strainer_id" form:"dialysis_strainer_id"`
+	DialysisIrrigationId       int64         `gorm:"column:dialysis_irrigation_id" json:"dialysis_irrigation_id" form:"dialysis_irrigation_id"`
 }
 
 func (DialysisPrescription) TableName() string {
@@ -630,6 +629,9 @@ type DialysisSolution struct {
 	BloodAccessPartId          string  `gorm:"column:blood_access_part_id" json:"blood_access_part_id" form:"blood_access_part_id"`
 	AnticoagulantWeichiHour    string  `gorm:"column:anticoagulant_weichi_hour" json:"anticoagulant_weichi_hour" form:"anticoagulant_weichi_hour"`
 	Dialyzate                  string  `gorm:"column:dialyzate" json:"dialyzate" form:"dialyzate"`
+	DialysisDialyszersId       int64   `gorm:"column:dialysis_dialyszers_id" json:"dialysis_dialyszers_id" form:"dialysis_dialyszers_id"`
+	DialysisStrainerId         int64   `gorm:"column:dialysis_strainer_id" json:"dialysis_strainer_id" form:"dialysis_strainer_id"`
+	DialysisIrrigationId       int64   `gorm:"column:dialysis_irrigation_id" json:"dialysis_irrigation_id" form:"dialysis_irrigation_id"`
 }
 
 func (DialysisSolution) TableName() string {

service/dialysis_service.go

@@ -223,6 +223,12 @@ func AddSigleRecord(prescription *models.DialysisPrescription) (err error) {
 	return errors
 }
 
+func AddSigleRecordOne(prescription *models.DialysisPrescription) (err error) {
+
+	errors := XTWriteDB().Model(&models.DialysisPrescription{}).Create(&prescription).Error
+	return errors
+}
+
 func UpdateAddSigleRecord(id int64, target_ultrafiltration float64) error {
 
 	err := XTWriteDB().Model(&models.DialysisPrescription{}).Where("id = ? and status =1", id).Updates(map[string]interface{}{"target_ultrafiltration": target_ultrafiltration, "prescription_water": target_ultrafiltration}).Error
@@ -1094,11 +1100,20 @@ func GetOneDialysisOrderOne(orgID, orderData int64, patient_id int64) (models.Di
 	return order, err
 }
 
+func GetPatientScheduleByPatientId(patient_id int64, user_org_id int64, schedule_date int64) (models.XtSchedule, error) {
+
+	schedule := models.XtSchedule{}
+
+	err := XTReadDB().Where("patient_id = ? and user_org_id = ? and schedule_date = ? and status=1", patient_id, user_org_id, schedule_date).Find(&schedule).Error
+
+	return schedule, err
+}
+
 func GetPscheduleDate(schedule_date int64, patient_id int64, user_org_id int64) (models.XtSchedule, error) {
 
 	schedule := models.XtSchedule{}
 
-	err := XTReadDB().Where("schedule_date = ? and patient_id = ? and user_org_id =? and status =1").Find(&schedule).Error
+	err := XTReadDB().Where("schedule_date = ? and patient_id = ? and user_org_id =? and status =1", schedule_date, patient_id, user_org_id).Find(&schedule).Error
 
 	return schedule, err
 }

service/patient_service.go

@@ -3286,6 +3286,12 @@ func GetDobuleCheck(user_org_id int64, advice_date int64) (check []*models.VmDou
 	return check, err
 }
 
+func GetDobuleCheckOne(user_org_id int64, advice_date int64, patient_id int64) (check models.VmDoubleCheck, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and check_date = ? and status = 1 and patient_id = ?", user_org_id, advice_date, patient_id).Find(&check).Error
+	return check, err
+}
+
 func GetTreatmentSummaryForList(user_org_id int64, advice_date int64) (summary []*models.VMTreatmentSummaryForList, err error) {
 
 	err = XTReadDB().Where("user_org_id =? and assessment_date = ? and status =1", user_org_id, advice_date).Find(&summary).Error
@@ -4340,3 +4346,12 @@ func GetPatientBefor(patient_id int64, record_date int64, user_org_id int64) (mo
 
 	return beforeDislysis, err
 }
+
+func GetDialysisPrescribeOneList(patient_id int64, record_date int64, user_org_id int64) (models.DialysisPrescription, error) {
+
+	prescription := models.DialysisPrescription{}
+
+	err := XTReadDB().Where("patient_id = ? and record_date= ? and user_org_id = ? and status=1", patient_id, record_date, user_org_id).Find(&prescription).Error
+
+	return prescription, err
+}

service/pharmacy_service.go

@@ -173,6 +173,29 @@ func GetTodayAdviceCountOne(stime int64, etime int64, orgid int64, is_medicine i
 	return advice, err
 }
 
+func GetTodayAdviceCountTwo(stime int64, etime int64, orgid int64, is_medicine int64) (advice []*models.HisDoctorAdviceInfo, err error) {
+
+	db := XTReadDB().Model(&advice).Where("status=1 and is_medicine = ?", is_medicine)
+	if stime > 0 {
+		db = db.Where("advice_date>=?", stime)
+	}
+	if etime > 0 {
+		db = db.Where("advice_date<=?", stime)
+	}
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+	err = db.Preload("Patient", "user_org_id = ? and status=1", orgid).Group("patient_id").Find(&advice).Error
+	return advice, err
+}
+
+func GetPatientAdviceScheduleByPatient(patient_id int64, user_org_id int64, advice_date int64) (list []*models.XtSchedule, err error) {
+
+	err = XTReadDB().Where("patient_id= ? and user_org_id = ? and schedule_date = ? and status=1", patient_id, user_org_id, advice_date).Find(&list).Error
+
+	return list, err
+}
+
 func GetPatientByAdviceId(patient_id int64) (models.TmpPatientOne, error) {
 
 	patient := models.TmpPatientOne{}

service/schedule_service.go

@@ -1520,6 +1520,30 @@ func GetHisDoctorAdviceList(org_id int64, patient_id int64, dialysis_date int64)
 	return adviceInfo, err
 }
 
+func GetMobileDoctorAdviceList(org_id int64, patient_id int64, dialysis_date int64) (advice []*models.DoctorAdvice, err error) {
+
+	err = XTReadDB().Where("patient_id=? and user_org_id = ? and advice_date= ? and status=1 and advice_type =2", patient_id, org_id, dialysis_date).Find(&advice).Error
+
+	return advice, err
+}
+
+func UpdateHisAdviceList(id int64, creater int64) (models.HisDoctorAdvice, error) {
+
+	doctorAdvice := models.HisDoctorAdvice{}
+	err := XTWriteDB().Model(&models.HisDoctorAdvice{}).Where("id = ? and status=1", id).Updates(map[string]interface{}{"checker": creater, "check_state": 1, "check_time": time.Now().Unix()}).Error
+
+	return doctorAdvice, err
+}
+
+func UpdateAdviceList(id int64, creater int64) (models.DoctorAdvice, error) {
+
+	advice := models.DoctorAdvice{}
+
+	err := XTWriteDB().Model(&models.DoctorAdvice{}).Where("id = ? and status=1", id).Updates(map[string]interface{}{"checker": creater, "check_state": 1, "check_time": time.Now().Unix()}).Error
+
+	return advice, err
+}
+
 func GetDoctorAdviceListSchedule(org_id int64, patient_id int64) (advices []*models.DoctorAdvice, err error) {
 
 	err = XTReadDB().Where("patient_id=? and user_org_id = ?  and status=1 and parent_id=0 and advice_type =1", patient_id, org_id).Preload("ChildDoctorAdvice", "status = 1").Find(&advices).Error

service/sign_service.go

@@ -2123,6 +2123,38 @@ func GetAllDialysisPrescription(patient_id int64) (list []*models.XtDialysisPres
 
 	return list, err
 }
+
+func GetPatientLapseList() (list []*models.XtPatients, err error) {
+
+	err = XTReadDB().Where("(lapseto =2 or lapseto =3) and status=1 and user_org_id !=10503 and user_org_id !=10447").Find(&list).Error
+
+	return list, err
+}
+
+func GetHisDoctorAdviceNoCheck(user_org_id int64) (advice []*models.HisDoctorAdviceInfo, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and status=1 and checker = 0", user_org_id).Find(&advice).Error
+
+	return advice, err
+}
+
+func UpdateHisAdvice(patient_id int64, advice_date int64, user_org_id int64, creater int64, check_date int64) (models.HisDoctorAdviceInfo, error) {
+
+	adviceInfo := models.HisDoctorAdviceInfo{}
+
+	err := XTWriteDB().Model(&adviceInfo).Where("patient_id = ? and advice_date = ? and user_org_id = ? and status=1", patient_id, advice_date, user_org_id).Updates(map[string]interface{}{"checker": creater, "check_state": 1, "check_time": check_date}).Error
+
+	return adviceInfo, err
+}
+
+func GetPatientScheduleListByItem(patient_id int64) (list []*models.XtSchedule, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and status=1", patient_id).Find(&list).Error
+
+	return list, err
+
+}
+
 func UpdateSchedulePrescrition(patient_id int64, record_date int64, user_org_id int64, mode_id int64) (models.XtSchedule, error) {
 
 	schedule := models.XtSchedule{}
@@ -2134,7 +2166,7 @@ func UpdateSchedulePrescrition(patient_id int64, record_date int64, user_org_id
 
 func GetAllDialysisOrder(patient_id int64, start_time int64, end_time int64) (list []*models.XtDialysisOrder, err error) {
 
-	err = XTReadDB().Where("patient_id = ? and status =1 and dialysis_date>=1541001600 and dialysis_date<=?", patient_id, end_time).Find(&list).Error
+	err = XTReadDB().Where("patient_id = ? and status =1 and dialysis_date>=1199116800 and dialysis_date<=?", patient_id, end_time).Find(&list).Error
 
 	return list, err
 }

service/stock_service.go

@@ -7333,6 +7333,13 @@ func GetAllGoodList(orgid int64) (good []*models.GoodInfo, err error) {
 	return good, err
 }
 
+func GetMobileGoodList(org_id int64) (list []*models.GoodInformationThirty, err error) {
+
+	err = XTReadDB().Where("org_id = ? and status =1", org_id).Find(&list).Error
+
+	return list, err
+}
+
 func GetAllMobileProjectList(orgid int64) (project []*models.HisProject, err error) {
 
 	err = XTReadDB().Where("user_org_id =? and status =1", orgid).Find(&project).Error