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

controllers/dialysis_api_controller.go

@@ -121,6 +121,8 @@ func DialysisApiRegistRouters() {
 	beego.Router("/api/patient/checkdialysisinformation", &DialysisApiController{}, "Get:CheckDialysisInformation")
 
 	beego.Router("/api/dialysis/patientsflow", &DialysisApiController{}, "Get:GetDialysisPatientsFlow")
+
+	beego.Router("/api/patient/getlongdialysisadvicetoday", &DialysisApiController{}, "Get:GetLongDialysisAdviceToday")
 }
 
 func (c *DialysisApiController) GetQueueCall() {
@@ -623,7 +625,7 @@ func (c *DialysisApiController) PostPrescription() {
 		// 查询信息规挡的设置天数
 
 		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
-		if infor.ID > 0 {
+		if infor.ID > 0 && infor.WeekDay > 0 {
 
 			var cha_time int64
 
@@ -738,7 +740,7 @@ func (c *DialysisApiController) PostPrescription() {
 		// 查询信息规挡的设置天数
 
 		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
-		if infor.ID > 0 {
+		if infor.ID > 0 && infor.WeekDay > 0 {
 
 			var cha_time int64
 
@@ -762,6 +764,23 @@ func (c *DialysisApiController) PostPrescription() {
 
 		updateErr := service.UpDateDialysisPrescription(&prescription)
 
+		//创建步骤表
+		finish := models.XtDialysisFinish{
+			IsFinish:   1,
+			UserOrgId:  adminUserInfo.CurrentOrgId,
+			Status:     1,
+			Ctime:      time.Now().Unix(),
+			Mtime:      0,
+			Module:     1,
+			RecordDate: recordDate.Unix(),
+			Sourse:     1,
+			PatientId:  patient,
+		}
+
+		dialysisFinish, _ := service.GetDialysisFinish(adminUserInfo.CurrentOrgId, recordDate.Unix(), 1, patient)
+		if dialysisFinish.ID == 0 {
+			service.CreateDialysisFinish(finish)
+		}
 		//修改处方
 		if adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 10340 {
 			// 患者的临时医嘱里查找是否有抗凝剂临时医嘱
@@ -976,7 +995,7 @@ func (c *DialysisApiController) PostSoulution() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 		var cha_time int64
 
 		timeNowStr := time.Now().Format("2006-01-02")
@@ -1327,6 +1346,23 @@ func (c *DialysisApiController) PostSoulution() {
 
 	err := service.SavePrescriptionAndCreateSolution(&solution, &prescription)
 
+	//创建步骤表
+	finishOne := models.XtDialysisFinish{
+		IsFinish:   1,
+		UserOrgId:  adminUserInfo.CurrentOrgId,
+		Status:     1,
+		Ctime:      time.Now().Unix(),
+		Mtime:      0,
+		Module:     1,
+		RecordDate: recordDate.Unix(),
+		Sourse:     1,
+		PatientId:  patient,
+	}
+
+	dialysisFinishOne, _ := service.GetDialysisFinish(adminUserInfo.CurrentOrgId, recordDate.Unix(), 1, patient)
+	if dialysisFinishOne.ID == 0 {
+		service.CreateDialysisFinish(finishOne)
+	}
 	//获取最新1条
 	dialysisSolution, _ := service.GetLastPatientDialysisSolution(patient, adminUserInfo.CurrentOrgId)
 
@@ -1571,7 +1607,7 @@ func (c *DialysisApiController) PostDouleCheck() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -1777,7 +1813,7 @@ func (c *DialysisApiController) PostReceiveTreatmentAsses() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -1846,6 +1882,29 @@ func (c *DialysisApiController) PostReceiveTreatmentAsses() {
 		//	}
 		//}
 
+		// 查询信息规挡的设置天数
+
+		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
+		if infor.ID > 0 && infor.WeekDay > 0 {
+			var cha_time int64
+			timeNowStr := time.Now().Format("2006-01-02")
+			timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+			//今日的日期减去设置的日期
+			cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+			if cha_time >= recordDate.Unix() {
+				//查询审核是否允许
+				infor, _ := service.GetDialysisInformationByRecordDate(id, recordDate.Unix(), adminUserInfo.CurrentOrgId)
+				//申请状态不允许的情况 拒绝修改
+				if infor.ApplicationStatus != 1 {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+					return
+				}
+
+			}
+		}
+
 		receiveTreatmentAsses.Creater = receiveTreatment.Creater
 		receiveTreatmentAsses.CreatedTime = receiveTreatment.CreatedTime
 		receiveTreatmentAsses.UpdateTime = time.Now().Unix()
@@ -2298,7 +2357,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		// 查询信息规挡的设置天数
 
 		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
-		if infor.ID > 0 {
+		if infor.ID > 0 && infor.WeekDay > 0 {
 
 			var cha_time int64
 
@@ -2432,6 +2491,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 				newprescribe.RecordDate = recordDate.Unix()
 				newprescribe.DewaterAmount = dewater_amount
 				newprescribe.TargetUltrafiltration = dewater_amount
+				newprescribe.Chaptalization = lastDialysisPrescribe.Chaptalization
 				newprescribe.Status = 1
 
 				err := service.AddSigleRecord(&newprescribe)
@@ -2490,6 +2550,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 					newprescribe.Status = 1
 					newprescribe.Creater = adminUserInfo.AdminUser.Id
 					newprescribe.PrescriptionDoctor = adminUserInfo.AdminUser.Id
+					newprescribe.Chaptalization = lastDialysisPrescribe.Chaptalization
 
 					err := service.AddSigleRecord(&newprescribe)
 					key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
@@ -2687,6 +2748,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 			newprescribe.RecordDate = recordDate.Unix()
 			newprescribe.DewaterAmount = dewater_amount
 			newprescribe.TargetUltrafiltration = dewater_amount
+			newprescribe.Chaptalization = lastDialysisPrescribe.Chaptalization
 			newprescribe.Status = 1
 
 			err := service.AddSigleRecord(&newprescribe)
@@ -2742,6 +2804,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 				newprescribe.RecordDate = recordDate.Unix()
 				newprescribe.DewaterAmount = dewater_amount
 				newprescribe.TargetUltrafiltration = dewater_amount
+				newprescribe.Chaptalization = lastDialysisPrescribe.Chaptalization
 				newprescribe.Status = 1
 
 				err := service.AddSigleRecord(&newprescribe)
@@ -2814,6 +2877,24 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		}
 
 		err := service.UpadatePredialysisEvaluation(&assessmentBeforeDislysis)
+
+		//创建步骤表
+		finish := models.XtDialysisFinish{
+			IsFinish:   1,
+			UserOrgId:  adminUserInfo.CurrentOrgId,
+			Status:     1,
+			Ctime:      time.Now().Unix(),
+			Mtime:      0,
+			Module:     3,
+			RecordDate: recordDate.Unix(),
+			Sourse:     1,
+			PatientId:  patient,
+		}
+
+		dialysisFinish, _ := service.GetDialysisFinish(adminUserInfo.CurrentOrgId, recordDate.Unix(), 3, patient)
+		if dialysisFinish.ID == 0 {
+			service.CreateDialysisFinish(finish)
+		}
 		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
 		redis := service.RedisClient()
 		//清空key 值
@@ -2895,7 +2976,7 @@ func (c *DialysisApiController) PostTreatmentSummary() {
 		// 查询信息规挡的设置天数
 
 		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
-		if infor.ID > 0 {
+		if infor.ID > 0 && infor.WeekDay > 0 {
 
 			var cha_time int64
 
@@ -2964,6 +3045,28 @@ func (c *DialysisApiController) PostTreatmentSummary() {
 		//	}
 		//}
 
+		// 查询信息规挡的设置天数
+
+		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
+		if infor.ID > 0 && infor.WeekDay > 0 {
+			var cha_time int64
+			timeNowStr := time.Now().Format("2006-01-02")
+			timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+			//今日的日期减去设置的日期
+			cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+			if cha_time >= recordDate.Unix() {
+				//查询审核是否允许
+				infor, _ := service.GetDialysisInformationByRecordDate(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId)
+				//申请状态不允许的情况 拒绝修改
+				if infor.ApplicationStatus != 1 {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+					return
+				}
+			}
+		}
+
 		treatmentSummary.Creater = tempTreatmentSummary.Creater
 		treatmentSummary.CreatedTime = tempTreatmentSummary.CreatedTime
 		treatmentSummary.UpdatedTime = time.Now().Unix()
@@ -3465,7 +3568,7 @@ func (this *DialysisApiController) DelMonitor() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminInfo.CurrentOrgId)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -3612,7 +3715,7 @@ func (c *DialysisApiController) CreateMonitor() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -6731,11 +6834,24 @@ func (this *DialysisApiController) SaveInformation() {
 
 	patient_id, _ := this.GetInt64("patient_id")
 	record_date, _ := this.GetInt64("record_date")
-	adviceDate := this.GetString("selected_date")
-	timeLayout2 := "2006-01-02"
-	loc2, _ := time.LoadLocation("Local")
-	theTime, _ := time.ParseInLocation(timeLayout2, adviceDate, loc2)
-	AdviceDate := theTime.Unix()
+	startTime := this.GetString("selected_date")
+
+	timeLayout := "2006-01-02 15:04"
+	loc, _ := time.LoadLocation("Local")
+
+	if len(startTime) == 0 {
+		utils.ErrorLog("len(start_time) == 0")
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	theTime, err := time.ParseInLocation(timeLayout, startTime, loc)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	StartTime := theTime.Unix()
+	fmt.Println("startime-------------", StartTime)
 
 	module, _ := this.GetInt64("module")
 
@@ -6748,7 +6864,7 @@ func (this *DialysisApiController) SaveInformation() {
 		Module:            module,
 		PatientId:         patient_id,
 		RecordDate:        record_date,
-		ApplicationDate:   AdviceDate,
+		ApplicationDate:   StartTime,
 		Creater:           creater,
 		ApplicationStatus: 2,
 		Checker:           0,
@@ -6771,7 +6887,7 @@ func (this *DialysisApiController) SaveInformation() {
 		}
 	}
 	if infor.ID > 0 {
-		err := service.UpdateDialysisInformationById(patient_id, record_date, orgId, module, AdviceDate, remark)
+		err := service.UpdateDialysisInformationById(patient_id, record_date, orgId, module, StartTime, remark)
 		if err == nil {
 			this.ServeSuccessJSON(map[string]interface{}{
 				"information": information,
@@ -6781,3 +6897,38 @@ func (this *DialysisApiController) SaveInformation() {
 	}
 
 }
+
+func (this *DialysisApiController) GetLongDialysisAdviceToday() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	schedule_type, _ := this.GetInt64("schedule_type")
+
+	partion_type := this.GetString("partion_type")
+	var ids []string
+	ids = strings.Split(partion_type, ",")
+	start_time := this.GetString("selected_date")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+
+	list, err := service.GetLongDialysisAdviceToday(orgId, schedule_type, ids, startTime.Unix())
+
+	drug, _ := service.GetAllBaseDrugListTwenty(orgId)
+	_, config := service.FindXTHisRecordByOrgId(orgId)
+	appId := this.GetAdminUserInfo().CurrentAppId
+	doctorList, _ := service.GetAllAdminUsers(orgId, appId)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list":       list,
+			"drug":       drug,
+			"config":     config,
+			"doctorList": doctorList,
+		})
+		return
+
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+}

controllers/dialysis_record_api_controller.go

@@ -638,7 +638,7 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -647,8 +647,7 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 
 		//今日的日期减去设置的日期
 		cha_time = timeNewDate.Unix() - infor.WeekDay*86400
-
-		if cha_time >= scheduleDate {
+		if cha_time >= scheduleDate && infor.WeekDay != 0 {
 			//查询审核是否允许
 			infor, _ := service.GetDialysisInformationByRecordDate(patientID, scheduleDate, adminUserInfo.CurrentOrgId)
 			//申请状态不允许的情况 拒绝修改
@@ -1055,7 +1054,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -1691,7 +1690,7 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -1952,7 +1951,7 @@ func (this *DialysisRecordAPIController) ModifyStartDialysis() {
 	}
 
 	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -2110,7 +2109,7 @@ func (c *DialysisRecordAPIController) ModifyFinishDialysis() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 

controllers/doctors_api_controller.go

@@ -65,6 +65,8 @@ func DoctorApiRegistRouters() {
 	beego.Router("/api/patient/getfirstdetailbyid", &DoctorsApiController{}, "Get:GetFirstDetailById")
 	beego.Router("/api/patient/updatefirstdisease", &DoctorsApiController{}, "Post:UpdateFirstDisease")
 	beego.Router("/api/patient/deletefirstdisease", &DoctorsApiController{}, "Get:DeleteFirstDisease")
+
+	beego.Router("/api/schedule/new/long/advices", &DoctorsApiController{}, "Get:GetLongScheduleAdvicesList")
 }
 
 func (c *DoctorsApiController) ScheduleAdvices() {
@@ -1626,3 +1628,46 @@ func (c *DoctorsApiController) DeleteFirstDisease() {
 	c.ServeSuccessJSON(returnData)
 	return
 }
+
+func (c *DoctorsApiController) GetLongScheduleAdvicesList() {
+
+	schedualDate := c.GetString("date")
+	adviceType, _ := c.GetInt("advice_type")
+	patientType, _ := c.GetInt("patient_type")
+	delivery_way := c.GetString("delivery_way")
+	schedule_type, _ := c.GetInt64("schedule_type")
+	partition_type, _ := c.GetInt64("partition_type")
+	patient_id, _ := c.GetInt64("patient_id")
+	excution_way, _ := c.GetInt64("excution_way")
+	cost_type, _ := c.GetInt64("cost_type")
+	execution_frequency := c.GetString("execution_frequency")
+
+	date, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", schedualDate)
+	if parseDateErr != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	adminUserInfo := c.GetAdminUserInfo()
+	orgID := adminUserInfo.CurrentOrgId
+
+	scheduals, err := service.MobileGetLongScheduleDoctorAdvices(orgID, date.Unix(), adviceType, patientType, adminUserInfo.AdminUser.Id, delivery_way, schedule_type, partition_type, patient_id, excution_way, cost_type, execution_frequency)
+
+	adminUser, _ := service.GetAllAdminUsers(orgID, adminUserInfo.CurrentAppId)
+	if err != nil {
+		c.ErrorLog("获取排班信息失败:%v", err)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	} else {
+		filtedScheduals := []*service.MScheduleDoctorAdviceVM{}
+		for _, schedual := range scheduals {
+			if len(schedual.DoctorAdvices) > 0 {
+				filtedScheduals = append(filtedScheduals, schedual)
+			}
+		}
+		c.ServeSuccessJSON(map[string]interface{}{
+			"scheduals": filtedScheduals,
+			"adminUser": adminUser,
+		})
+	}
+
+}

controllers/his_api_controller.go

@@ -2636,6 +2636,23 @@ func (c *HisApiController) CreateHisPrescription() {
 			PatientDiagnosis:   patient_diagnose,
 		}
 		service.SavePatientPrescriptionInfo(hpInfo)
+		//创建步骤表
+		finish := models.XtDialysisFinish{
+			IsFinish:   1,
+			UserOrgId:  adminInfo.CurrentOrgId,
+			Status:     1,
+			Ctime:      time.Now().Unix(),
+			Mtime:      0,
+			Module:     4,
+			RecordDate: theTime.Unix(),
+			Sourse:     1,
+			PatientId:  patient_id,
+		}
+
+		dialysisFinish, _ := service.GetDialysisFinish(adminInfo.CurrentOrgId, theTime.Unix(), 4, patient_id)
+		if dialysisFinish.ID == 0 {
+			service.CreateDialysisFinish(finish)
+		}
 		redis := service.RedisClient()
 		key := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(theTime.Unix(), 10) + ":his_advices_list_all"
 		redis.Set(key, "", time.Second)
@@ -2669,6 +2686,23 @@ func (c *HisApiController) CreateHisPrescription() {
 			PatientDiagnosis:   patient_diagnose,
 		}
 		service.SavePatientPrescriptionInfo(hpInfo)
+		//创建步骤表
+		finish := models.XtDialysisFinish{
+			IsFinish:   1,
+			UserOrgId:  adminInfo.CurrentOrgId,
+			Status:     1,
+			Ctime:      time.Now().Unix(),
+			Mtime:      0,
+			Module:     4,
+			RecordDate: info.RecordDate,
+			Sourse:     1,
+			PatientId:  info.PatientId,
+		}
+
+		dialysisFinish, _ := service.GetDialysisFinish(adminInfo.CurrentOrgId, info.RecordDate, 4, info.PatientId)
+		if dialysisFinish.ID == 0 {
+			service.CreateDialysisFinish(finish)
+		}
 		redis := service.RedisClient()
 		key := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(theTime.Unix(), 10) + ":his_advices_list_all"
 		redis.Set(key, "", time.Second)
@@ -2846,6 +2880,14 @@ func (c *HisApiController) CreateHisPrescription() {
 							if s.PrescribingNumberUnit == medical.MaxUnit && medical.MaxUnit == medical.MinUnit {
 								total_count += prescribingNumberSeven
 							}
+							if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 3877 {
+								storeConfig, _ := service.GetAllStoreHouseConfig(adminInfo.CurrentOrgId)
+								lastWarehouse, _ := service.FindLastDrugWarehousingInfoByID(s.DrugId, storeConfig.DrugStorehouseOut)
+								if s.Price != lastWarehouse.RetailPrice {
+									s.Price = lastWarehouse.RetailPrice
+								}
+							}
+
 							service.CreateHisDoctorAdvice(&s)
 
 							//存储切片中
@@ -2907,6 +2949,17 @@ func (c *HisApiController) CreateHisPrescription() {
 								projectDetail, _ := service.GetHisPrescriptonProjectById(p.ID)
 								p.IsOut = projectDetail.IsOut
 							}
+							if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 3877 {
+								storeConfig, _ := service.GetAllStoreHouseConfig(adminInfo.CurrentOrgId)
+								if p.Type == 3 {
+									lastWarehouse, _ := service.FindFirstWarehousingInfoByStockThree(p.ProjectId, storeConfig.DrugStorehouseOut)
+									if p.Price != lastWarehouse.PackingPrice {
+										p.Price = lastWarehouse.PackingPrice
+									}
+								}
+
+							}
+
 							service.CreateHisProjectTwo(&p)
 							projectList = append(projectList, p)
 							var randNum int
@@ -3012,7 +3065,6 @@ func (c *HisApiController) CreateHisPrescription() {
 		//查询今日该患者开的药品处方
 		hisdoctorlist, _ := service.GetHisAdviceListByDrugIdTwo(patient_id, recordDateTime, adminInfo.CurrentOrgId)
 
-		fmt.Println("今日出库2333333333333333333333333333333333333333")
 		drugOutConfig, _ := service.GetDrugOpenConfigOne(adminInfo.CurrentOrgId)
 		//药品出库
 		if drugOutConfig.IsOpen == 1 {
@@ -3021,7 +3073,7 @@ func (c *HisApiController) CreateHisPrescription() {
 
 				// 查询该药品最后一次出库记录
 				druginfo, _ := service.GetLastDrugWarehouseOutByDrugIdTwenty(item.DrugId, patient_id, recordDateTime, item.ID)
-				fmt.Println("今日最后出库2333333333333333333333333333333333333333", druginfo)
+
 				if len(druginfo) > 0 {
 					//回退库存
 					for _, it := range druginfo {

controllers/his_project_api_controller.go

@@ -125,6 +125,7 @@ func (this *HisProjectApiController) SaveProject() {
 	specail_project, _ := this.GetInt64("specail_project")
 	social_security_directory_code := this.GetString("social_security_directory_code")
 	record_date := this.GetString("record_date")
+	is_print, _ := this.GetInt64("is_print")
 	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
@@ -164,6 +165,7 @@ func (this *HisProjectApiController) SaveProject() {
 		SpecailProject:              specail_project,
 		SocialSecurityDirectoryCode: social_security_directory_code,
 		RecordDate:                  theTime.Unix(),
+		IsPrint:                     is_print,
 	}
 	//查询项目名称是否存在
 	_, errcode := service.GetHisProjectIsExist(project_name, orgId)
@@ -258,6 +260,7 @@ func (this *HisProjectApiController) UpdatedProject() {
 	specail_project, _ := this.GetInt64("specail_project")
 	social_security_directory_code := this.GetString("social_security_directory_code")
 	record_date := this.GetString("record_date")
+	is_print, _ := this.GetInt64("is_print")
 	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
 	hisProject := models.XtHisProject{
 		ProjectName:                 project_name,
@@ -293,6 +296,7 @@ func (this *HisProjectApiController) UpdatedProject() {
 		SpecailProject:              specail_project,
 		SocialSecurityDirectoryCode: social_security_directory_code,
 		RecordDate:                  theTime.Unix(),
+		IsPrint:                     is_print,
 	}
 
 	err := service.UpdatedProject(id, &hisProject)

controllers/manage_api_controller.go

@@ -147,6 +147,14 @@ func ManageRouters() {
 	beego.Router("/api/manage/deleteobjecttabledisinfect", &MachineApiController{}, "Get:DeleteObjectTableDisinfect")
 	beego.Router("/api/manage/getairdisinfectionlongtime", &MachineApiController{}, "Get:GetAirDisinfectionLongTime")
 	beego.Router("/api/manage/getobjcttabledisinfectlongtime", &MachineApiController{}, "Get:GetObjectDisInfectionLongTime")
+
+	beego.Router("/api/manage/getinformationmanalist", &MachineApiController{}, "Get:GetInformationmanalist")
+
+	beego.Router("/api/manage/saveobjectregistration", &MachineApiController{}, "Post:SaveObjectRegistration")
+	beego.Router("/api/manage/getregistrationdisinfectlist", &MachineApiController{}, "Get:GetRegistrationDisinfectList")
+	beego.Router("/api/manage/getobjectregistrationbyidlist", &MachineApiController{}, "Get:GetObjectRegistrationByIdList")
+	beego.Router("/api/manage/updateobjectregistration", &MachineApiController{}, "Post:UpdateObjectRegistration")
+	beego.Router("/api/manage/deleteobjectregistration", &MachineApiController{}, "Get:DeleteObjectTregistration")
 }
 
 func (this *MachineApiController) SaveManageInfo() {
@@ -4292,6 +4300,7 @@ func (this *MachineApiController) GetWaterFormList() {
 
 	appId := this.GetAdminUserInfo().CurrentAppId
 	adminRole, err := service.GetAllDoctorTwo(orgId, appId)
+	operators, err := service.GetAdminUserEsOne(orgId)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
 		return
@@ -4300,6 +4309,7 @@ func (this *MachineApiController) GetWaterFormList() {
 		"list":      list,
 		"total":     total,
 		"adminRole": adminRole,
+		"operators": operators,
 	})
 }
 
@@ -5407,3 +5417,278 @@ func (this *MachineApiController) GetObjectDisInfectionLongTime() {
 		"list": list,
 	})
 }
+
+func (this *MachineApiController) GetInformationmanalist() {
+
+	//获取5月1日到5月27日的上机患者
+
+	list, _ := service.GetDialysisOrderPatient(9538)
+
+	for _, dialysisOrder := range list {
+
+		//根据床位号获取设备型号
+		unitType, _ := service.GetUnitType(dialysisOrder.BedId, dialysisOrder.UserOrgId)
+		//查询使用消毒最后一条消毒记录
+		_, err := service.GetLaseDeviceInfomation(dialysisOrder.UserOrgId, dialysisOrder.BedId, dialysisOrder.DialysisDate, dialysisOrder.SchedualType)
+		fmt.Println("err", err)
+		if err == gorm.ErrRecordNotFound {
+			//查找排班
+			scheduleByPatient, _ := service.GetScheduleByPatient(dialysisOrder.PatientId, dialysisOrder.DialysisDate, dialysisOrder.UserOrgId)
+			//查询改设备是否有消毒计划
+			plan, errcode := service.GetDisInfectionTime(dialysisOrder.UserOrgId, unitType.UnitType, dialysisOrder.SchedualType, scheduleByPatient.ScheduleWeek)
+
+			//根据床位号获取设备id
+			addmacher, _ := service.GetEquimentIDTwo(dialysisOrder.BedId, dialysisOrder.UserOrgId)
+
+			//查询病人信息
+			patients, _ := service.GetPatientInfoMation(dialysisOrder.PatientId)
+			var con = ""
+			if patients.IsInfectious == 0 {
+				con = ""
+			}
+			if patients.IsInfectious == 1 {
+				con = "无"
+			}
+			if patients.IsInfectious == 2 {
+				con = "有"
+			}
+
+			if errcode == nil {
+				var end_time int64
+				end_time = dialysisOrder.EndTime + plan.DisinfecTime*60
+				//新增消毒
+				information := models.DeviceInformation{
+					Date:                  dialysisOrder.DialysisDate,
+					Zone:                  dialysisOrder.ZoneId,
+					Class:                 dialysisOrder.SchedualType,
+					BedNumber:             dialysisOrder.BedId,
+					PatientId:             dialysisOrder.PatientId,
+					DialysisMode:          scheduleByPatient.ModeId,
+					LongTime:              strconv.FormatInt(plan.DisinfecTime, 10),
+					Disinfection:          1,
+					DialysisConcentration: 1,
+					DisinfectionStatus:    1,
+					Move:                  1,
+					UserOrgId:             dialysisOrder.UserOrgId,
+					DisinfectType:         plan.Way,
+					DisinfectantType:      plan.MachineDisinfectant,
+					FluidPath:             plan.DisinfectanWay, //液路消毒方式
+					Disinfectant:          plan.Disinfectant,
+					Ctime:                 time.Now().Unix(),
+					Status:                1,
+					SignName:              dialysisOrder.FinishNurse,
+					EquimentId:            addmacher.ID,
+					DisinfectionResidue:   2,
+					Bed:                   addmacher.BedNumber,
+					StartTime:             dialysisOrder.StartTime,
+					EndTime:               dialysisOrder.EndTime,
+					Contagion:             con,
+					WeightLoss:            0,
+					Hyperfiltratio:        0,
+					DialysisHour:          "",
+					MachineRun:            1,
+					DisinfecStartime:      dialysisOrder.EndTime,
+					DisinfecEndtime:       end_time,
+				}
+				err := service.CreateInformationTwo(&information)
+				fmt.Println("报错", err)
+			}
+		}
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}
+
+func (this *MachineApiController) SaveObjectRegistration() {
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	fmt.Println(err)
+	record_date := dataBody["record_date"].(string)
+
+	recorddate, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+	recorddateunix := recorddate.Unix()
+
+	model_number := dataBody["model_number"].(string)
+	user_count := dataBody["user_count"].(string)
+
+	product_date := dataBody["product_date"].(string)
+
+	productdate, _ := time.ParseInLocation(timeLayout+" 15:04:05", product_date+" 00:00:00", loc)
+	productdateunix := productdate.Unix()
+
+	expiry_date := dataBody["expiry_date"].(string)
+
+	expirydate, _ := time.ParseInLocation(timeLayout+" 15:04:05", expiry_date+" 00:00:00", loc)
+	expirydateunix := expirydate.Unix()
+
+	packaging_identification := int64(dataBody["packaging_identification"].(float64))
+
+	destroy_people := int64(dataBody["destroy_people"].(float64))
+
+	destroy_nubmer := dataBody["destroy_nubmer"].(string)
+
+	destroy_way := int64(dataBody["destroy_way"].(float64))
+
+	leader := int64(dataBody["leader"].(float64))
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	registration := models.XtDialysisRegistration{
+		RecordDate:              recorddateunix,
+		ModelNumber:             model_number,
+		UserCount:               user_count,
+		ProductDate:             productdateunix,
+		ExpiryDate:              expirydateunix,
+		PackagingIdentification: packaging_identification,
+		DestroyPeople:           destroy_people,
+		DestroyNubmer:           destroy_nubmer,
+		DestroyWay:              destroy_way,
+		Leader:                  leader,
+		UserOrgId:               orgId,
+		Status:                  1,
+		Ctime:                   time.Now().Unix(),
+		Mtime:                   0,
+	}
+
+	err = service.CreateObjectRegistration(registration)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"registration": registration,
+	})
+
+}
+
+func (this *MachineApiController) GetRegistrationDisinfectList() {
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	limit, _ := this.GetInt64("limit")
+	page, _ := this.GetInt64("page")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	list, total, err := service.GetRegistrationDisinfectList(limit, page, startTime, endTime, orgId)
+
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":  list,
+		"total": total,
+	})
+}
+
+func (this *MachineApiController) GetObjectRegistrationByIdList() {
+
+	id, _ := this.GetInt64("id")
+
+	list, err := service.GetObjectRegistrationByIdList(id)
+
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}
+
+func (this *MachineApiController) UpdateObjectRegistration() {
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	fmt.Println(err)
+	record_date := dataBody["record_date"].(string)
+
+	recorddate, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+	recorddateunix := recorddate.Unix()
+
+	model_number := dataBody["model_number"].(string)
+	user_count := dataBody["user_count"].(string)
+
+	product_date := dataBody["product_date"].(string)
+
+	productdate, _ := time.ParseInLocation(timeLayout+" 15:04:05", product_date+" 00:00:00", loc)
+	productdateunix := productdate.Unix()
+
+	expiry_date := dataBody["expiry_date"].(string)
+
+	expirydate, _ := time.ParseInLocation(timeLayout+" 15:04:05", expiry_date+" 00:00:00", loc)
+	expirydateunix := expirydate.Unix()
+
+	packaging_identification := int64(dataBody["packaging_identification"].(float64))
+
+	destroy_people := int64(dataBody["destroy_people"].(float64))
+
+	destroy_nubmer := dataBody["destroy_nubmer"].(string)
+
+	destroy_way := int64(dataBody["destroy_way"].(float64))
+
+	leader := int64(dataBody["leader"].(float64))
+
+	id := int64(dataBody["id"].(float64))
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	registration := models.XtDialysisRegistration{
+		ID:                      id,
+		RecordDate:              recorddateunix,
+		ModelNumber:             model_number,
+		UserCount:               user_count,
+		ProductDate:             productdateunix,
+		ExpiryDate:              expirydateunix,
+		PackagingIdentification: packaging_identification,
+		DestroyPeople:           destroy_people,
+		DestroyNubmer:           destroy_nubmer,
+		DestroyWay:              destroy_way,
+		Leader:                  leader,
+		UserOrgId:               orgId,
+		Status:                  1,
+		Ctime:                   time.Now().Unix(),
+		Mtime:                   0,
+	}
+
+	service.UpdateObjectRegistration(registration)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"registration": registration,
+	})
+}
+
+func (this *MachineApiController) DeleteObjectTregistration() {
+
+	id, _ := this.GetInt64("id")
+	err := service.DeleteObjectTregistration(id)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"msg": "ok",
+	})
+	return
+}

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -379,6 +379,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 			newprescribe.DewaterAmount = dewater_amount
 			newprescribe.TargetUltrafiltration = dewater_amount
 			newprescribe.PrescriptionWater = dewater_amount
+			newprescribe.Chaptalization = dialysisSolution.Chaptalization
 			newprescribe.Status = 1
 			if adminUserInfo.Org.Id != 10013 && adminUserInfo.Org.Id != 10014 {
 				newprescribe.Remark = dialysisSolution.Remark
@@ -465,6 +466,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				newprescribe.PrescriptionWater = dewater_amount
 				newprescribe.Status = 1
 				newprescribe.Remark = lastDialysisPrescribe.Remark
+				newprescribe.Chaptalization = lastDialysisPrescribe.Chaptalization
 				if adminUserInfo.Org.Id == 10340 {
 					newprescribe.TargetUltrafiltration = 0
 				}
@@ -530,6 +532,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				newprescribe.RecordDate = theAssessmentDateTime
 				newprescribe.DewaterAmount = dewater_amount
 				newprescribe.TargetUltrafiltration = dewater_amount
+				newprescribe.Chaptalization = lastDialysisPrescribe.Chaptalization
 				newprescribe.Status = 1
 
 				if adminUserInfo.Org.Id == 10340 {

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -86,7 +86,7 @@ func (this *DialysisAPIController) Scheduals() {
 	defer redis.Close()
 
 	key := "scheduals_" + schedualDate + "_" + strconv.FormatInt(orgID, 10)
-	redis.Set(key, "", time.Second)
+
 	scheduals_json_str, _ := redis.Get(key).Result()
 
 	patients, _ := service.GetAllPatientListSix(orgID)
@@ -697,7 +697,7 @@ func (c *DialysisAPIController) PostAtreatmentInfo() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -908,7 +908,7 @@ func (c *DialysisAPIController) PostDoubleCheck() {
 		// 查询信息规挡的设置天数
 
 		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
-		if infor.ID > 0 {
+		if infor.ID > 0 && infor.WeekDay > 0 {
 
 			var cha_time int64
 
@@ -1124,7 +1124,7 @@ func (c *DialysisAPIController) PostAcceptsAssessment() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -1223,6 +1223,30 @@ func (c *DialysisAPIController) PostAcceptsAssessment() {
 		//		return
 		//	}
 		//}
+		// 查询信息规挡的设置天数
+
+		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
+		if infor.ID > 0 && infor.WeekDay > 0 {
+
+			var cha_time int64
+
+			timeNowStr := time.Now().Format("2006-01-02")
+			timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+			//今日的日期减去设置的日期
+			cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+			if cha_time >= recordDate.Unix() {
+				//查询审核是否允许
+				infor, _ := service.GetDialysisInformationByRecordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
+				//申请状态不允许的情况 拒绝修改
+				if infor.ApplicationStatus != 1 {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+					return
+				}
+
+			}
+		}
 
 		receiveTreatmentAsses.Creater = receiveTreatment.Creater
 		receiveTreatmentAsses.CreatedTime = receiveTreatment.CreatedTime
@@ -1253,6 +1277,7 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 	weightAfter, _ := c.GetFloat("weight_after", 0)
 	additionalWeight, _ := c.GetFloat("additional_weight", 0)
 	weightReduce, _ := c.GetFloat("weight_loss", 0)
+	fmt.Println("weight_loss", weightReduce)
 	temperature, _ := c.GetFloat("temperature", 0)
 	pulse_frequency, _ := c.GetFloat("pulse_frequency", 0)
 	breathing_rate := c.GetString("breathing_rate")
@@ -1260,7 +1285,10 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 
 	diastolic_blood_pressure, _ := c.GetFloat("diastolic_blood_pressure", 0)
 	actual_ultrafiltration, _ := c.GetFloat("actual_ultrafiltration", 0)
+
+	fmt.Println("actual_ultrafiltration233232322323", actual_ultrafiltration)
 	actual_displacement, _ := c.GetFloat("actual_displacement", 0)
+
 	actualtreatHour, _ := c.GetInt64("actual_treatment_hour", 0)
 	actualtreatmin, _ := c.GetInt64("actual_treatment_minute", 0)
 	cruor := c.GetString("cruor")
@@ -1330,6 +1358,7 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 	after_urea := c.GetString("after_urea")
 	pip_coagulation := c.GetString("pip_coagulation")
 	accumulated_blood_volume := c.GetString("accumulated_blood_volume")
+	fmt.Println("accumulated_blood_volume", accumulated_blood_volume)
 	if id <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -1337,6 +1366,7 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 
 	adminUserInfo := c.GetMobileAdminUserInfo()
 	patient, _ := service.FindPatientById(adminUserInfo.Org.Id, id)
+
 	if patient.ID == 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
 		return
@@ -1346,6 +1376,7 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 		recordDateStr = time.Now().Format("2006-01-02")
 	}
 	recordDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
+	fmt.Println("parseDateErr", parseDateErr)
 	if parseDateErr != nil {
 		c.ErrorLog("日期(%v)解析错误：%v", recordDateStr, parseDateErr)
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -1442,7 +1473,7 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -1507,8 +1538,30 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 				"assessmentAfterDislysis": assessmentAfterDislysis,
 			})
 		}
+		return
 	} else { //修改
 
+		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
+		if infor.ID > 0 && infor.WeekDay > 0 {
+
+			var cha_time int64
+
+			timeNowStr := time.Now().Format("2006-01-02")
+			timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+			//今日的日期减去设置的日期
+			cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+			if cha_time >= recordDate.Unix() {
+				//查询审核是否允许
+				infor, _ := service.GetDialysisInformationByRecordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
+				//申请状态不允许的情况 拒绝修改
+				if infor.ApplicationStatus != 1 {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+					return
+				}
+
+			}
+		}
 		if appRole.UserType == 2 || appRole.UserType == 1 {
 			assessmentAfterDislysis.AssessmentDoctor = adminUserInfo.AdminUser.Id
 			assessmentAfterDislysis.AssessmentTime = time.Now().Unix()
@@ -1523,6 +1576,7 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 		assessmentAfterDislysis.ID = assessmentAfter.ID
 
 		err := service.UpdateAssessmentAfterDislysisRecord(&assessmentAfterDislysis)
+		fmt.Println("werwewweoweoweoweoewoewoew", err)
 		redis := service.RedisClient()
 		keyTwo := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
 
@@ -1534,13 +1588,16 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 
 		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_after_dislysis_list_all"
 		redis.Set(keyOne, "", time.Second)
-
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"assessmentAfterDislysis": assessmentAfterDislysis,
 			})
+			return
 		}
+
 	}
+
+	return
 }
 
 func (c *DialysisAPIController) PostDialysisPrescription() {
@@ -1711,7 +1768,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -2294,7 +2351,7 @@ func (c *DialysisAPIController) Finish() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -3008,7 +3065,7 @@ func (this *DialysisAPIController) StartDialysis() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -3203,7 +3260,7 @@ func (this *DialysisAPIController) StartDialysis() {
 	}
 
 	//只针对广慈医院
-	if template.TemplateId == 26 || template.TemplateId == 25 || template.TemplateId == 28 || adminUserInfo.Org.Id == 9987 || adminUserInfo.Org.Id == 9526 || template.TemplateId == 32 || adminUserInfo.Org.Id == 9918 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 4 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10445 {
+	if template.TemplateId == 26 || template.TemplateId == 25 || template.TemplateId == 28 || adminUserInfo.Org.Id == 9987 || adminUserInfo.Org.Id == 9526 || template.TemplateId == 32 || adminUserInfo.Org.Id == 9918 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 4 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10517 {
 		// 查询病人是否有透前评估数据
 		befor, errcode := service.GetAssessmentBefor(adminUserInfo.Org.Id, patientID, recordDate.Unix())
 
@@ -3480,7 +3537,7 @@ func (c *DialysisAPIController) PostSolution() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -3611,6 +3668,7 @@ func (c *DialysisAPIController) PostSolution() {
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
+	fmt.Println("appRole0000000000000", appRole.UserType)
 	//
 	if appRole.UserType == 2 || appRole.UserType == 1 {
 		prescription_doctor = adminUserInfo.AdminUser.Id
@@ -4199,6 +4257,7 @@ func (this *DialysisAPIController) ModifyStartDialysisOrder() {
 	difficult_puncture_nurse, _ := this.GetInt64("difficult_puncture_nurse")
 	new_fistula_nurse, _ := this.GetInt64("new_fistula_nurse")
 	quality_nurse_id, _ := this.GetInt64("quality_nurse_id")
+	fmt.Println("quality_nurse_id", quality_nurse_id)
 	patient_id, _ := this.GetInt64("patient_id")
 	record_date, _ := this.GetInt64("record_date")
 	puncture_needle := this.GetString("puncture_needle")
@@ -4398,7 +4457,7 @@ func (this *DialysisAPIController) ModifyStartDialysisOrder() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -5778,7 +5837,7 @@ func (c *DialysisAPIController) CreateStockOutInfo() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminInfo.Org.Id)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -5799,6 +5858,24 @@ func (c *DialysisAPIController) CreateStockOutInfo() {
 
 		}
 	}
+
+	//创建步骤表
+	finish := models.XtDialysisFinish{
+		IsFinish:   1,
+		UserOrgId:  adminInfo.Org.Id,
+		Status:     1,
+		Ctime:      time.Now().Unix(),
+		Mtime:      0,
+		Module:     11,
+		RecordDate: record_time,
+		Sourse:     1,
+		PatientId:  patient_id,
+	}
+
+	dialysisFinish, _ := service.GetDialysisFinish(adminInfo.Org.Id, record_time, 11, patient_id)
+	if dialysisFinish.ID == 0 {
+		service.CreateDialysisFinish(finish)
+	}
 	consumables, _ := service.FindConsumablesByDate(adminInfo.Org.Id, patient_id, record_time)
 
 	_, record := service.FindAutomaticReduceRecordByOrgId(adminInfo.Org.Id)
@@ -6221,7 +6298,7 @@ func (c *DialysisAPIController) EditConsumables() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminInfo.Org.Id)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -7100,7 +7177,7 @@ func (c *DialysisAPIController) CreateOtherStockOutInfo() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminInfo.Org.Id)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 

controllers/mobile_api_controllers/dialysis_api_controller_extend.go

@@ -122,7 +122,7 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminInfo.Org.Id)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -395,7 +395,7 @@ func (this *DialysisAPIController) EditMonitorRecord() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(monitor.MonitoringDate)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -468,7 +468,7 @@ func (this *DialysisAPIController) DeleteMonitor() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminInfo.Org.Id)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 

controllers/mobile_api_controllers/mobile_api_base_controller.go

@@ -7,7 +7,6 @@ import (
 	"XT_New/service"
 	"bytes"
 	"encoding/json"
-	"fmt"
 	"log"
 	"os"
 	"path"
@@ -143,7 +142,6 @@ func (this *MobileBaseAPIAuthController) Prepare() {
 
 			//redis key值
 			key := "purviews_" + strconv.FormatInt(adminUserInfo.Org.Id, 10) + strconv.FormatInt(adminUserInfo.AdminUser.Id, 10)
-			fmt.Println("ket--------------------", key)
 
 			redis.Set(key, "", time.Second)
 			purviews_json_str, _ := redis.Get(key).Result()

controllers/mobile_api_controllers/patient_api_controller.go

@@ -314,7 +314,7 @@ func (c *PatientApiController) EditDoctorAdvice() {
 			// 查询信息规挡的设置天数
 
 			infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
-			if infor.ID > 0 {
+			if infor.ID > 0 && infor.WeekDay > 0 {
 
 				var cha_time int64
 
@@ -696,7 +696,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			// 查询信息规挡的设置天数
 
 			infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
-			if infor.ID > 0 {
+			if infor.ID > 0 && infor.WeekDay > 0 {
 
 				var cha_time int64
 
@@ -705,8 +705,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 				//今日的日期减去设置的日期
 				cha_time = timeNewDate.Unix() - infor.WeekDay*86400
-				fmt.Println("cha_time----------------", cha_time)
-				fmt.Println("advices.232323232222", record_date)
+
 				if cha_time >= record_date {
 					//查询审核是否允许
 					infor, _ := service.GetDialysisInformationByRecordDate(advices.PatientId, advices.AdviceDate, adminUserInfo.Org.Id)
@@ -1904,7 +1903,7 @@ func (c *PatientApiController) CheckDoctorAdvice() {
 			// 查询信息规挡的设置天数
 
 			infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
-			if infor.ID > 0 {
+			if infor.ID > 0 && infor.WeekDay > 0 {
 
 				var cha_time int64
 
@@ -2173,6 +2172,7 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 	// 计算透析处方的相关超滤量
 	schedual, _ := service.MobileGetSchedualDetailSix(adminUserInfo.Org.Id, patient.ID, theAssessmentDateTime)
 	lastDialysisPrescription, _ := service.MobileGetLastDialysisPrescription(patient.ID, adminUserInfo.Org.Id)
+
 	var lastDialysisPrescribe *models.DialysisPrescription
 	var dialysisSolution *models.DialysisSolution
 	var dialysisPrescribe *models.DialysisPrescription
@@ -2254,6 +2254,7 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 		newprescribe.DialysisDialyszers = dialysisSolution.DialysisDialyszers
 		newprescribe.DialysisIrrigation = dialysisSolution.DialysisIrrigation
 		newprescribe.Remark = lastDialysisPrescription.Remark
+		newprescribe.Chaptalization = lastDialysisPrescribe.Chaptalization
 		_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, theAssessmentDateTime, adminUserInfo.Org.Id)
 		newprescribe.ID = dialysisPrescription.ID
 
@@ -2374,6 +2375,7 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 			newprescribe.DialysisIrrigation = lastDialysisPrescribe.DialysisIrrigation
 			newprescribe.DialysisDialyszers = lastDialysisPrescribe.DialysisDialyszers
 			newprescribe.Remark = lastDialysisPrescription.Remark
+			newprescribe.Chaptalization = lastDialysisPrescribe.Chaptalization
 			_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, theAssessmentDateTime, adminUserInfo.Org.Id)
 			newprescribe.ID = dialysisPrescription.ID
 			if dialysisPrescription.ID == 0 {
@@ -2487,6 +2489,7 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 			newprescribe.DialysisDialyszers = system_dialysisPrescribe.DialysisDialyszers
 			newprescribe.DialysisIrrigation = system_dialysisPrescribe.DialysisIrrigation
 			newprescribe.Remark = lastDialysisPrescription.Remark
+			newprescribe.Chaptalization = lastDialysisPrescribe.Chaptalization
 			_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, theAssessmentDateTime, adminUserInfo.Org.Id)
 			newprescribe.ID = dialysisPrescription.ID
 			if dialysisPrescription.ID == 0 {
@@ -2653,7 +2656,7 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -3208,6 +3211,7 @@ func predialysisEvaluationFormData(evaluation *models.PredialysisEvaluation, dat
 
 	if dataBody["is_infect"] != nil && reflect.TypeOf(dataBody["is_infect"]).String() == "string" {
 		is_infect, _ := dataBody["is_infect"].(string)
+		fmt.Println("is_infect================", is_infect)
 		infect, _ := strconv.ParseInt(is_infect, 10, 64)
 		evaluation.IsInfect = infect
 	}
@@ -3418,7 +3422,6 @@ func predialysisEvaluationFormData(evaluation *models.PredialysisEvaluation, dat
 		befor_symptoms := dataBody["befor_symptoms"].(string)
 		evaluation.BeforSymptoms = befor_symptoms
 
-		fmt.Println("befor_symptomsss23333333333333333333333333", befor_symptoms)
 	}
 	return
 }
@@ -4358,7 +4361,7 @@ func (c *PatientApiController) CreateGroupAdvice() {
 		// 查询信息规挡的设置天数
 
 		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
-		if infor.ID > 0 {
+		if infor.ID > 0 && infor.WeekDay > 0 {
 
 			var cha_time int64
 
@@ -4647,7 +4650,7 @@ func (c *PatientApiController) DelDoctorAdvice() {
 		// 查询信息规挡的设置天数
 
 		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
-		if infor.ID > 0 {
+		if infor.ID > 0 && infor.WeekDay > 0 {
 
 			var cha_time int64
 

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -400,6 +400,17 @@ func (this *StaffScheduleApiController) GetAllZonePb() {
 		}
 	}
 
+	//针对百霖和贝尔
+	if orgid == 10138 || orgid == 10278 || orgid == 3877 {
+		//获取今日的排班数据
+		list, _ := service.GetMobileScheduleListByScheduleDate(orgid, startTime)
+		for _, item := range list {
+			solution, _ := service.GetLongSolutionByModeId(item.PatientId, item.ModeId, item.UserOrgId)
+			var str = solution.DialysisDialyszers + "/" + solution.DialysisIrrigation
+			service.UpdateScheduleByDialysis(item.PatientId, item.ModeId, item.ScheduleDate, item.UserOrgId, str, item.ScheduleType)
+		}
+	}
+
 	// stockType, _ := service.GetStockType(orgid)
 	//zonelist, _ := service.GetPatientScheduleListByZone(startTime, classtype, orgid)
 	// if err != nil {
@@ -890,6 +901,7 @@ func (c *StaffScheduleApiController) GetSolutionSchedule() {
 	loc, _ := time.LoadLocation("Local")
 	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", scheduleDate+" 00:00:00", loc)
 	schedule, _ := service.GetSolutionScheduleBySchedule(orgId, zoneid, classtype, theTime.Unix())
+
 	c.ServeSuccessJSON(map[string]interface{}{
 		"schedule": schedule,
 	})

controllers/patient_api_controller.go

@@ -108,7 +108,7 @@ func (c *PatientApiController) GetPatientsList() {
 	reimbursement_way, _ := c.GetInt64("reimbursement_way", 0)
 	isscheduling, _ := c.GetInt64("isscheduling", 0)
 	isprescription, _ := c.GetInt64("isprescription", 0)
-
+	patientSoureType, _ := c.GetInt64("patientSoureType")
 	if page <= 0 {
 		page = 1
 	}
@@ -147,7 +147,7 @@ func (c *PatientApiController) GetPatientsList() {
 
 	var patients []*models.Patients
 	var total int64
-	patients, total, err = service.GetPatientList(adminUserInfo.CurrentOrgId, keywords, page, limit, schedulType, bindingState, lapseto, source, theStartTIme, theEndtTIme, contagion, reimbursement_way, isscheduling, isprescription, isStartTime, isEndTime)
+	patients, total, err = service.GetPatientList(adminUserInfo.CurrentOrgId, keywords, page, limit, schedulType, bindingState, lapseto, source, theStartTIme, theEndtTIme, contagion, reimbursement_way, isscheduling, isprescription, isStartTime, isEndTime, patientSoureType)
 
 	c.ServeSuccessJSON(map[string]interface{}{
 		"patients": patients,
@@ -229,7 +229,6 @@ func (c *PatientApiController) CreatePatient() {
 	fmt.Println(code)
 	fmt.Println(patient)
 
-	fmt.Println("contagions是什么", contagions)
 	if code > 0 {
 		c.ServeFailJSONWithSGJErrorCode(code)
 		return
@@ -367,6 +366,7 @@ func (c *PatientApiController) CreatePatient() {
 		TreatmentPlan:                patient.TreatmentPlan,
 		Doctor:                       patient.Doctor,
 		RecordNumber:                 patient.RecordNumber,
+		PatientSource:                patient.PatientSource,
 	}
 
 	err = service.CreatePatientsNew(&patientsNew)
@@ -584,6 +584,7 @@ func (c *PatientApiController) EditPatient() {
 		SchRemark:                 patient.SchRemark,
 		TreatmentPlan:             patient.TreatmentPlan,
 		RecordNumber:              patient.RecordNumber,
+		PatientSource:             patient.PatientSource,
 	}
 	//	//更新病人ID获取新表病人ID
 	err = service.UpdatepatientTwo(&patientsNew, id)
@@ -1343,7 +1344,7 @@ func (c *PatientApiController) CreateGroupAdvice() {
 		// 查询信息规挡的设置天数
 
 		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
-		if infor.ID > 0 {
+		if infor.ID > 0 && infor.WeekDay > 0 {
 
 			var cha_time int64
 
@@ -1717,7 +1718,7 @@ func (c *PatientApiController) CreateDoctorAdvice() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -2053,7 +2054,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 		// 查询信息规挡的设置天数
 
 		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
-		if infor.ID > 0 {
+		if infor.ID > 0 && infor.WeekDay > 0 {
 
 			var cha_time int64
 
@@ -2843,7 +2844,7 @@ func (c *PatientApiController) CheckDoctorAdvice() {
 		// 查询信息规挡的设置天数
 
 		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
-		if infor.ID > 0 {
+		if infor.ID > 0 && infor.WeekDay > 0 {
 
 			var cha_time int64
 
@@ -3058,7 +3059,7 @@ func (c *PatientApiController) UpdateDoctorAdvice() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -3295,7 +3296,7 @@ func (c *PatientApiController) DeleteDoctorAdvice() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -3366,7 +3367,7 @@ func (c *PatientApiController) DeleteGroupAdvice() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -4910,6 +4911,26 @@ func patientFormData(patient *models.Patients, data []byte, method string) (cont
 		record_number := patientBody["record_number"].(string)
 		patient.RecordNumber = record_number
 	}
+
+	patient_source := int64(patientBody["patient_source"].(float64))
+	if patient_source <= 0 {
+		utils.ErrorLog("patient_source <= 0")
+		code = enums.ErrorCodeParamWrong
+		return
+	}
+	patient.PatientSource = patient_source
+
+	if patientBody["patient_start_time"] != nil && reflect.TypeOf(patientBody["patient_start_time"]).String() == "string" {
+		patient_start_time := patientBody["patient_start_time"].(string)
+		var startTime int64
+		if len(patient_start_time) > 0 {
+			theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", patient_start_time+" 00:00:00", loc)
+
+			startTime = theTime.Unix()
+		}
+		patient.PatientStartTime = startTime
+	}
+
 	return
 }
 

controllers/patient_dataconfig_api_controller.go

@@ -38,6 +38,8 @@ func PatientDataConfigAPIControllerRegistRouters() {
 
 	beego.Router("/api/patient/getpatientdialysisinforlist", &PatientDataConfigAPIController{}, "get:GetPatientDialysisInforList")
 
+	beego.Router("/api/patient/getcontextschedulelist", &PatientDataConfigAPIController{}, "Get:GetContextScheduleList")
+
 }
 
 type PatientDataConfigAPIController struct {
@@ -1056,7 +1058,6 @@ func (this *PatientDataConfigAPIController) GetPatientDialysisInforList() {
 		}
 		startTime = theTime.Unix()
 	}
-	fmt.Println("startTime0000000000000000", startTime)
 
 	//获取患者姓名
 	patient, _ := service.GetPatientName(patientID)
@@ -1090,3 +1091,53 @@ func (this *PatientDataConfigAPIController) GetPatientDialysisInforList() {
 		"afterDislysis":   afterDislysis,
 	})
 }
+
+func (this *PatientDataConfigAPIController) GetContextScheduleList() {
+
+	limit, _ := this.GetInt64("limit")
+
+	page, _ := this.GetInt64("page")
+
+	start_time := this.GetString("start_time")
+
+	end_time := this.GetString("end_time")
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+
+	org_id := this.GetAdminUserInfo().CurrentOrgId
+
+	schedule, total, _ := service.GetContextScheduleListGroupPatientId(limit, page, startTime, endTime, org_id)
+
+	list, _, _ := service.GetContextScheduleListPatientId(startTime, endTime, org_id)
+
+	patients, _ := service.GetAllpatientThirty(org_id)
+
+	devicenumber, _ := service.GetAllBedNumber(org_id)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"schedule":     schedule,
+		"total":        total,
+		"list":         list,
+		"patients":     patients,
+		"devicenumber": devicenumber,
+	})
+}

controllers/print_data_api_controller.go

@@ -37,7 +37,8 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 	idStrs := strings.Split(schIDStr, ",")
 	adminUserInfo := this.GetAdminUserInfo()
 
-	if this.GetAdminUserInfo().CurrentOrgId == 10016 || this.GetAdminUserInfo().CurrentOrgId == 9882 || this.GetAdminUserInfo().CurrentOrgId == 10138 || this.GetAdminUserInfo().CurrentOrgId == 10278 || this.GetAdminUserInfo().CurrentOrgId == 9841 || this.GetAdminUserInfo().CurrentOrgId == 9845 || this.GetAdminUserInfo().CurrentOrgId == 10081 || this.GetAdminUserInfo().CurrentOrgId == 10215 || this.GetAdminUserInfo().CurrentOrgId == 10121 || this.GetAdminUserInfo().CurrentOrgId == 10234 || this.GetAdminUserInfo().CurrentOrgId == 10188 || this.GetAdminUserInfo().CurrentOrgId == 10217 || this.GetAdminUserInfo().CurrentOrgId == 10340 || this.GetAdminUserInfo().CurrentOrgId == 9905 || this.GetAdminUserInfo().CurrentOrgId == 10346 || this.GetAdminUserInfo().CurrentOrgId == 10441 {
+	if this.GetAdminUserInfo().CurrentOrgId == 10016 || this.GetAdminUserInfo().CurrentOrgId == 9882 || this.GetAdminUserInfo().CurrentOrgId == 10138 || this.GetAdminUserInfo().CurrentOrgId == 10278 || this.GetAdminUserInfo().CurrentOrgId == 9841 || this.GetAdminUserInfo().CurrentOrgId == 9845 || this.GetAdminUserInfo().CurrentOrgId == 10081 || this.GetAdminUserInfo().CurrentOrgId == 10215 || this.GetAdminUserInfo().CurrentOrgId == 10121 || this.GetAdminUserInfo().CurrentOrgId == 10234 || this.GetAdminUserInfo().CurrentOrgId == 10188 || this.GetAdminUserInfo().CurrentOrgId == 10217 || this.GetAdminUserInfo().CurrentOrgId == 10340 || this.GetAdminUserInfo().CurrentOrgId == 9905 || this.GetAdminUserInfo().CurrentOrgId == 10346 || this.GetAdminUserInfo().CurrentOrgId == 10441 || this.GetAdminUserInfo().CurrentOrgId == 9970 || this.GetAdminUserInfo().CurrentOrgId == 10101 {
+
 		schedules, getScheduleErr := service.GetSchedulesSeven(adminUserInfo.CurrentOrgId, idStrs)
 		for _, item := range schedules {
 
@@ -88,11 +89,14 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 			item.Summer = summerVM
 
 			list, _ := service.GetDialysisOrderCountSeven(item.PatientID, item.ScheduleDate)
-			if this.GetAdminUserInfo().CurrentOrgId != 10101 && this.GetAdminUserInfo().CurrentOrgId != 9671 && this.GetAdminUserInfo().CurrentOrgId != 10345 {
+			if this.GetAdminUserInfo().CurrentOrgId != 10101 && this.GetAdminUserInfo().CurrentOrgId != 9671 && this.GetAdminUserInfo().CurrentOrgId != 10345 && this.GetAdminUserInfo().CurrentOrgId != 9970 {
 				item.Count = list.Count
 			}
-			if this.GetAdminUserInfo().CurrentOrgId == 10101 || this.GetAdminUserInfo().CurrentOrgId == 9671 || this.GetAdminUserInfo().CurrentOrgId == 10345 {
-				if item.ScheduleDate <= 1640966400 {
+
+			if this.GetAdminUserInfo().CurrentOrgId == 10101 || this.GetAdminUserInfo().CurrentOrgId == 9671 || this.GetAdminUserInfo().CurrentOrgId == 10345 || this.GetAdminUserInfo().CurrentOrgId == 9970 {
+
+				if item.ScheduleDate <= 1672416000 {
+					fmt.Print("进来1")
 					listOne, _ := service.GetDialysisOrderCountEight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
 
 					item.Patient.TotalDialysis = listOne.Count
@@ -100,6 +104,7 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 				}
 
 				if item.ScheduleDate >= 1672502400 {
+					fmt.Print("进来2")
 					listOne, _ := service.GetDialysisOrderCountNight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
 
 					item.Patient.TotalDialysis = listOne.Count
@@ -136,7 +141,7 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 		})
 	}
 
-	if this.GetAdminUserInfo().CurrentOrgId != 10016 && this.GetAdminUserInfo().CurrentOrgId != 9882 && this.GetAdminUserInfo().CurrentOrgId != 10138 && this.GetAdminUserInfo().CurrentOrgId != 10278 && this.GetAdminUserInfo().CurrentOrgId != 9841 && this.GetAdminUserInfo().CurrentOrgId != 9845 && this.GetAdminUserInfo().CurrentOrgId != 10081 && this.GetAdminUserInfo().CurrentOrgId != 10215 && this.GetAdminUserInfo().CurrentOrgId != 10121 && this.GetAdminUserInfo().CurrentOrgId != 10234 && this.GetAdminUserInfo().CurrentOrgId != 10188 && this.GetAdminUserInfo().CurrentOrgId != 10217 && this.GetAdminUserInfo().CurrentOrgId != 10340 && this.GetAdminUserInfo().CurrentOrgId != 9905 && this.GetAdminUserInfo().CurrentOrgId != 10346 && this.GetAdminUserInfo().CurrentOrgId != 10441 {
+	if this.GetAdminUserInfo().CurrentOrgId != 10016 && this.GetAdminUserInfo().CurrentOrgId != 9882 && this.GetAdminUserInfo().CurrentOrgId != 10138 && this.GetAdminUserInfo().CurrentOrgId != 10278 && this.GetAdminUserInfo().CurrentOrgId != 9841 && this.GetAdminUserInfo().CurrentOrgId != 9845 && this.GetAdminUserInfo().CurrentOrgId != 10081 && this.GetAdminUserInfo().CurrentOrgId != 10215 && this.GetAdminUserInfo().CurrentOrgId != 10121 && this.GetAdminUserInfo().CurrentOrgId != 10234 && this.GetAdminUserInfo().CurrentOrgId != 10188 && this.GetAdminUserInfo().CurrentOrgId != 10217 && this.GetAdminUserInfo().CurrentOrgId != 10340 && this.GetAdminUserInfo().CurrentOrgId != 9905 && this.GetAdminUserInfo().CurrentOrgId != 10346 && this.GetAdminUserInfo().CurrentOrgId != 10441 && this.GetAdminUserInfo().CurrentOrgId != 9970 && this.GetAdminUserInfo().CurrentOrgId != 10101 {
 		schedules, getScheduleErr := service.GetSchedules(adminUserInfo.CurrentOrgId, idStrs)
 		for _, item := range schedules {
 			list, _ := service.GetDialysisOrderCountSeven(item.PatientID, item.ScheduleDate)

controllers/schedule_api_controller.go

@@ -216,7 +216,6 @@ func (c *ScheduleApiController) BatchPostSmartSch() {
 				sch_id := int64(items["sch_id"].(float64))
 				if sch_id > 0 { //修改排班信息
 					schedule, _ = service.GetScheduleTwo(adminInfo.CurrentOrgId, sch_id)
-					fmt.Println("2222222")
 
 					if items["mode_id"] == nil || reflect.TypeOf(items["mode_id"]).String() != "float64" {
 						utils.ErrorLog("mode_id")

controllers/self_drug_api_congtroller.go

@@ -77,6 +77,7 @@ func SelfDrugRouters() {
 	beego.Router("/api/drug/deletedruginventory", &SelfDrugApiController{}, "Get:DeleteDrugInventory")
 	beego.Router("/api/drug/getdruginventoryprintlist", &SelfDrugApiController{}, "Get:GetDrugInventoryPrintList")
 	beego.Router("/api/drug/getinventorydetaillist", &SelfDrugApiController{}, "Get:GetDrugInventoryDetailList")
+	beego.Router("/api/drug/getinventorydetailprintlist", &SelfDrugApiController{}, "Get:GetInventoryDetailPrintList")
 	beego.Router("/api/drug/savedrugproofinventory", &SelfDrugApiController{}, "Get:SaveDrugProofInventory")
 	beego.Router("/api/drug/getdrugwarehouseinfototal", &StockManagerApiController{}, "Get:GetDrugWarehouseInfoTotal")
 
@@ -4008,3 +4009,29 @@ func (this *SelfDrugApiController) GetDrugInventoryWarehouseInfoList() {
 		"dealerList":       dealerList,
 	})
 }
+
+func (this *SelfDrugApiController) GetInventoryDetailPrintList() {
+	keyword := this.GetString("keyword")
+	limit, _ := this.GetInt64("limit")
+	page, _ := this.GetInt64("page")
+	storehouse_id, _ := this.GetInt64("storehouse_id")
+	ids := this.GetString("ids")
+	idSplit := strings.Split(ids, ",")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	list, total, err := service.GetDrugInventoryDetailMapList(keyword, page, limit, orgId, storehouse_id, idSplit)
+	inventoryList, _, _ := service.GetDrugInventoryDetailListTwo(keyword, page, limit, orgId, storehouse_id)
+	houseList, _ := service.GetAllStoreHouseList(orgId)
+	doctorList, _ := service.GetAllDoctorThree(orgId)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"total":         total,
+		"list":          list,
+		"doctorList":    doctorList,
+		"houseList":     houseList,
+		"inventoryList": inventoryList,
+	})
+}

controllers/stock_in_api_controller.go

@@ -7792,10 +7792,12 @@ func (this *StockManagerApiController) GetPrintList() {
 	limit, _ := this.GetInt64("limit")
 	page, _ := this.GetInt64("page")
 	good_name := this.GetString("good_name")
+	ids := this.GetString("ids")
+	idSplit := strings.Split(ids, ",")
 	fmt.Println(storehouse_id, good_name)
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	houseList, _ := service.GetAllStoreHouseList(orgId)
-	list, total, _ := service.GetInventoryDetailList(good_name, limit, page, orgId, storehouse_id)
+	list, total, _ := service.GetInventoryDetailPrintMapList(good_name, limit, page, orgId, storehouse_id, idSplit)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"list":      list,
 		"total":     total,

main.go

@@ -14,7 +14,7 @@ func init() {
 func main() {
 	//service.NewAutoCreateWeekSchedules()
 
-	service.BeginAutoCreateWeekDisinfectionJob()
+	//service.BeginAutoCreateWeekDisinfectionJob()
 	//service.BeginAutoCreatePlanJob()
 	//	//service.AutoClearSchedules()
 	//service.BeginAutoCreateStaffScheduleJob()

models/device_models.go

@@ -1465,3 +1465,26 @@ func (XtDialysisInformation) TableName() string {
 
 	return "xt_dialysis_information"
 }
+
+type XtDialysisRegistration struct {
+	ID                      int64  `gorm:"column:id" json:"id" form:"id"`
+	RecordDate              int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	ModelNumber             string `gorm:"column:model_number" json:"model_number" form:"model_number"`
+	UserCount               string `gorm:"column:user_count" json:"user_count" form:"user_count"`
+	ProductDate             int64  `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate              int64  `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	PackagingIdentification int64  `gorm:"column:packaging_identification" json:"packaging_identification" form:"packaging_identification"`
+	DestroyPeople           int64  `gorm:"column:destroy_people" json:"destroy_people" form:"destroy_people"`
+	DestroyNubmer           string `gorm:"column:destroy_nubmer" json:"destroy_nubmer" form:"destroy_nubmer"`
+	DestroyWay              int64  `gorm:"column:destroy_way" json:"destroy_way" form:"destroy_way"`
+	Leader                  int64  `gorm:"column:leader" json:"leader" form:"leader"`
+	UserOrgId               int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status                  int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime                   int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                   int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+func (XtDialysisRegistration) TableName() string {
+
+	return "xt_dialysis_registration"
+}

models/dialysis.go

@@ -898,6 +898,7 @@ type XtDialysisOrder struct {
 	UserName       int64  `gorm:"column:user_name" json:"user_name" form:"user_name"`
 	WashpipeNurse  int64  `gorm:"column:washpipe_nurse" json:"washpipe_nurse" form:"washpipe_nurse"`
 	Url            string `gorm:"column:url" json:"url" form:"url"`
+	ZoneId         int64  `gorm:"column:zone_id" json:"zone_id" form:"zone_id"`
 }
 
 func (XtDialysisOrder) TableName() string {

models/his_models.go

@@ -43,6 +43,7 @@ type XtHisProject struct {
 	SpecailProject              int64   `gorm:"column:specail_project" json:"specail_project" form:"specail_project"`
 	SocialSecurityDirectoryCode string  `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
 	RecordDate                  int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	IsPrint                     int64   `gorm:"column:is_print" json:"is_print" form:"is_print"`
 }
 
 func (XtHisProject) TableName() string {
@@ -600,6 +601,7 @@ type HisProject struct {
 	RecordDate                  int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
 	SingleDose                  string  `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
 	ExecutionFrequency          string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	IsPrint                     int64   `gorm:"column:is_print" json:"is_print" form:"is_print"`
 }
 
 func (HisProject) TableName() string {

models/patient_models.go

@@ -222,6 +222,8 @@ type Patients struct {
 	TreatmentPlan            string  `gorm:"column:treatment_plan" json:"treatment_plan" form:"treatment_plan"`
 	Doctor                   int64   `gorm:"column:doctor" json:"doctor" form:"doctor"`
 	RecordNumber             string  `gorm:"column:record_number" json:"record_number" form:"record_number"`
+	PatientSource            int64   `gorm:"column:patient_source" json:"patient_source" form:"patient_source"`
+	PatientStartTime         int64   `gorm:"column:patient_start_time" json:"patient_start_time" form:"patient_start_time"`
 }
 
 func (Patients) TableName() string {
@@ -814,6 +816,8 @@ type XtPatientsNew struct {
 	Doctor                       int64   `gorm:"column:doctor" json:"doctor" form:"doctor"`
 	ScheduleRemark               string  `gorm:"column:schedule_remark" json:"schedule_remark" form:"schedule_remark"`
 	RecordNumber                 string  `gorm:"column:record_number" json:"record_number" form:"record_number"`
+	PatientSource                int64   `gorm:"column:patient_source" json:"patient_source" form:"patient_source"`
+	PatientStartTime             int64   `gorm:"column:patient_start_time" json:"patient_start_time" form:"patient_start_time"`
 }
 
 func (XtPatientsNew) TableName() string {
@@ -1663,10 +1667,11 @@ func (DialysisPrescriptionTwenty) TableName() string {
 }
 
 type DialysisPrescriptionThrity struct {
-	ID        int64  `gorm:"column:id" json:"id"`
-	UserOrgId int64  `gorm:"column:user_org_id" json:"user_org_id"`
-	PatientId int64  `gorm:"column:patient_id" json:"patient_id"`
-	Remark    string `gorm:"column:remark" json:"remark" form:"remark"`
+	ID             int64  `gorm:"column:id" json:"id"`
+	UserOrgId      int64  `gorm:"column:user_org_id" json:"user_org_id"`
+	PatientId      int64  `gorm:"column:patient_id" json:"patient_id"`
+	Remark         string `gorm:"column:remark" json:"remark" form:"remark"`
+	Chaptalization string `gorm:"column:chaptalization" json:"chaptalization" form:"chaptalization"`
 }
 
 func (DialysisPrescriptionThrity) TableName() string {
@@ -1954,3 +1959,20 @@ type XtPatientPhysiqueCheck struct {
 func (XtPatientPhysiqueCheck) TableName() string {
 	return "xt_patient_physique_check"
 }
+
+type ConScheduleList struct {
+	UserOrgId    int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PartitionId  int64 `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
+	BedId        int64 `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	PatientId    int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	ScheduleDate int64 `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
+	ScheduleType int64 `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
+	ScheduleWeek int64 `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
+	ModeId       int64 `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	IsExport     int64 `gorm:"column:is_export" json:"is_export" form:"is_export"`
+	Status       int64 `gorm:"column:status" json:"status" form:"status"`
+}
+
+func (ConScheduleList) TableName() string {
+	return "xt_schedule"
+}

models/schedule_models.go

@@ -710,3 +710,27 @@ type ScheduleConfig struct {
 func (ScheduleConfig) TableName() string {
 	return "xt_schedule_config"
 }
+
+type VmLongBloodSchedule struct {
+	ID              int64                      `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId       int64                      `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PartitionId     int64                      `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
+	BedId           int64                      `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	PatientId       int64                      `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	ScheduleDate    int64                      `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
+	ScheduleType    int64                      `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
+	ScheduleWeek    int64                      `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
+	ModeId          int64                      `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	Status          int64                      `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime     int64                      `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime     int64                      `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	IsExport        int64                      `gorm:"column:is_export" json:"is_export" form:"is_export"`
+	DeviceNumber    *NewMDeviceNumberVM        `gorm:"ForeignKey:BedId" json:"device_number"`
+	SchedualPatient *NewMSchedualPatientVMList `gorm:"ForeignKey:PatientId" json:"patient"`
+	XtDoctorAdvice  []*XtDoctorAdvice          `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"xt_doctor_advice"`
+	HisDoctorAdvice []*HisDoctorAdviceFourty   `gorm:"ForeignKey:PatientId,AdviceDate;AssociationForeignKey:PatientId,ScheduleDate" json:"his_doctor_advice"`
+}
+
+func (VmLongBloodSchedule) TableName() string {
+	return "xt_schedule"
+}

service/dialysis_solution_service.go

@@ -556,3 +556,31 @@ func GetHisDialysisGoodCountTwo(orgID int64, schedule_type int64, partition_id [
 
 	return schedule, err
 }
+
+func GetLongDialysisAdviceToday(orgID int64, schedule_type int64, partition_id []string, scheduleDate int64) (schedule []*models.VmLongBloodSchedule, err error) {
+
+	db := XTReadDB().Model(&models.VmLongBloodSchedule{}).Where("status = 1")
+
+	if scheduleDate > 0 {
+		db = db.Where("schedule_date = ?", scheduleDate)
+	}
+	if schedule_type > 0 {
+		db = db.Where("schedule_type = ?", schedule_type)
+	}
+	if len(partition_id) > 0 {
+		db = db.Where("partition_id in(?)", partition_id)
+	}
+
+	if orgID > 0 {
+		db = db.Where("user_org_id  = ?", orgID)
+	}
+	err = db.Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+		Preload("XtDoctorAdvice", "status = 1 AND user_org_id = ?  and advice_type = 1", orgID).
+		Preload("HisDoctorAdvice", func(db *gorm.DB) *gorm.DB {
+			return db.Where("user_org_id = ? and status = 1 and advice_date = ?", orgID, scheduleDate).Preload("Drug", "org_id =? and status = 1", orgID)
+		}).Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).Find(&schedule).Error
+
+	return schedule, err
+
+}

service/doctor_schedule_service.go

@@ -801,3 +801,20 @@ func GetPatientScheduleListByZone(schedule_date int64, class_tye int64, orgid in
 	err = db.Select("partition_id,Count(id) as id,user_org_id").Group("partition_id").Scan(&schedule).Error
 	return schedule, err
 }
+
+func GetMobileScheduleListByScheduleDate(org_id int64, schedule_date int64) (schedule []*models.Search_Schedule, err error) {
+
+	db := XTReadDB().Model(&schedule).Where("status= 1")
+
+	if org_id > 0 {
+		db = db.Where("user_org_id = ?", org_id)
+	}
+
+	if schedule_date > 0 {
+		db = db.Where("schedule_date=?", schedule_date)
+	}
+
+	err = db.Find(&schedule).Error
+
+	return schedule, err
+}

service/his_project_service.go

@@ -59,7 +59,7 @@ func GetProjectDetail(id int64) (models.XtHisProject, error) {
 
 func UpdatedProject(id int64, pro *models.XtHisProject) error {
 
-	err := XTWriteDB().Model(&pro).Where("id=?", id).Updates(map[string]interface{}{"project_name": pro.ProjectName, "pinyin": pro.Pinyin, "wubi": pro.Pinyin, "price": pro.Price, "unit": pro.Unit, "cost_classify": pro.CostClassify, "executive_section": pro.ExecutiveSection, "medical_coverage": pro.MedicalCoverage, "statistical_classification": pro.StatisticalClassification, "disease_directory": pro.DiseaseDirectory, "is_record": pro.IsRecord, "medical_code": pro.MedicalCode, "tube_color": pro.TubeColor, "medical_status": pro.MedicalStatus, "remark": pro.Remark, "sign": pro.Sign, "default_number": pro.DefaultNumber, "is_default": pro.IsDefault, "is_charge": pro.IsCharge, "is_estimate": pro.IsEstimate, "is_workload": pro.IsWorkload, "sort": pro.Sort, "doctor_advice": pro.DoctorAdvice, "single_dose": pro.SingleDose, "execution_frequency": pro.ExecutionFrequency, "delivery_way": pro.DeliveryWay, "number_days": pro.NumberDays, "total": pro.Total, "updated_time": pro.UpdatedTime, "category": pro.Category, "specail_project": pro.SpecailProject, "social_security_directory_code": pro.SocialSecurityDirectoryCode, "record_date": pro.RecordDate}).Error
+	err := XTWriteDB().Model(&pro).Where("id=?", id).Updates(map[string]interface{}{"project_name": pro.ProjectName, "pinyin": pro.Pinyin, "wubi": pro.Pinyin, "price": pro.Price, "unit": pro.Unit, "cost_classify": pro.CostClassify, "executive_section": pro.ExecutiveSection, "medical_coverage": pro.MedicalCoverage, "statistical_classification": pro.StatisticalClassification, "disease_directory": pro.DiseaseDirectory, "is_record": pro.IsRecord, "medical_code": pro.MedicalCode, "tube_color": pro.TubeColor, "medical_status": pro.MedicalStatus, "remark": pro.Remark, "sign": pro.Sign, "default_number": pro.DefaultNumber, "is_default": pro.IsDefault, "is_charge": pro.IsCharge, "is_estimate": pro.IsEstimate, "is_workload": pro.IsWorkload, "sort": pro.Sort, "doctor_advice": pro.DoctorAdvice, "single_dose": pro.SingleDose, "execution_frequency": pro.ExecutionFrequency, "delivery_way": pro.DeliveryWay, "number_days": pro.NumberDays, "total": pro.Total, "updated_time": pro.UpdatedTime, "category": pro.Category, "specail_project": pro.SpecailProject, "social_security_directory_code": pro.SocialSecurityDirectoryCode, "record_date": pro.RecordDate, "is_print": pro.IsPrint}).Error
 	return err
 }
 

service/his_service.go

@@ -941,7 +941,7 @@ func FindPatientPrescriptionInfoTwo(org_id int64, patient_id int64, record_date
 }
 
 func FindLastPatientPrescriptionInfoTwo(org_id int64, patient_id int64, record_date int64, p_type int64) (info models.HisPrescriptionInfo, err error) {
-	err = readDb.Model(&models.HisPrescriptionInfo{}).Where("user_org_id = ? AND status = 1 AND record_date < ? AND patient_id = ? AND p_type = ? ", org_id, record_date, patient_id, p_type).First(&info).Error
+	err = readDb.Model(&models.HisPrescriptionInfo{}).Where("user_org_id = ? AND status = 1 AND record_date < ? AND patient_id = ? AND p_type = ? ", org_id, record_date, patient_id, p_type).Last(&info).Error
 	return
 
 }

service/inspection_service.go

@@ -12,9 +12,9 @@ func GetInspectionReference(orgId int64, inspect_type int64) (reference []*model
 		var count int
 		err = readDb.Model(&models.InspectionReference{}).Where("org_id=? and status=1 and inspection_type = 0", orgId).Count(&count).Error
 		if count > 0 {
-			err = readDb.Model(&models.InspectionReference{}).Where("org_id=? and status=1 and inspection_type = 0", orgId).Order("project_id").Find(&reference).Error
+			err = readDb.Model(&models.InspectionReference{}).Where("org_id=? and status=1 and inspection_type = 0", orgId).Order("project_id,created_time").Find(&reference).Error
 		} else {
-			err = readDb.Model(&models.InspectionReference{}).Where("org_id=0 and status=1 and inspection_type = 0").Order("project_id").Find(&reference).Error
+			err = readDb.Model(&models.InspectionReference{}).Where("org_id=0 and status=1 and inspection_type = 0").Order("project_id,created_time").Find(&reference).Error
 		}
 
 	} else {
@@ -22,9 +22,9 @@ func GetInspectionReference(orgId int64, inspect_type int64) (reference []*model
 		var count int
 		err = readDb.Model(&models.InspectionReference{}).Where("org_id=? and status=1 and inspection_type = ?", orgId, inspect_type).Count(&count).Error
 		if count > 0 {
-			err = readDb.Model(&models.InspectionReference{}).Where("org_id=? and status=1 and inspection_type = ?", orgId, inspect_type).Order("project_id").Find(&reference).Error
+			err = readDb.Model(&models.InspectionReference{}).Where("org_id=? and status=1 and inspection_type = ?", orgId, inspect_type).Order("project_id,created_time").Find(&reference).Error
 		} else {
-			err = readDb.Model(&models.InspectionReference{}).Where("org_id=0 and status=1 and inspection_type = ?", inspect_type).Order("project_id").Find(&reference).Error
+			err = readDb.Model(&models.InspectionReference{}).Where("org_id=0 and status=1 and inspection_type = ?", inspect_type).Order("project_id,created_time").Find(&reference).Error
 		}
 
 	}

service/manage_center_service.go

@@ -853,7 +853,7 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 				BatchNumber:             info.BatchNumber,
 				Count:                   prescribingNumber,
 				UserOrgId:               advice.UserOrgId,
-				PatientId:               0,
+				PatientId:               advice.PatientId,
 				SystemTime:              info.SysRecordTime,
 				ConsumableType:          7,
 				IsSys:                   0,

service/manage_service.go

@@ -1741,3 +1741,56 @@ func GetObjectDisInfectionLongTime(user_org_id int64) (list []*models.XtNewObjec
 	err = XTReadDB().Where("user_org_id = ? and status = 1", user_org_id).Find(&list).Error
 	return
 }
+
+func GetDialysisOrderPatient(org_id int64) (order []*models.XtDialysisOrder, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and dialysis_date>=? and dialysis_date<=? and status =1", org_id, 1672502400, 1675094400).Find(&order).Error
+
+	return order, err
+}
+
+func CreateObjectRegistration(registration models.XtDialysisRegistration) error {
+
+	err := XTWriteDB().Create(&registration).Error
+
+	return err
+}
+
+func GetRegistrationDisinfectList(limit int64, page int64, start_time int64, end_time int64, user_org_id int64) (list []*models.XtDialysisRegistration, total int64, err error) {
+
+	offset := (page - 1) * limit
+
+	db := XTReadDB().Model(&list).Where("status =1")
+	if start_time > 0 {
+		db = db.Where("record_date >= ?", start_time)
+	}
+	if end_time > 0 {
+		db = db.Where("record_date <= ?", end_time)
+	}
+	if user_org_id > 0 {
+		db = db.Where("user_org_id = ?", user_org_id)
+	}
+	err = db.Count(&total).Offset(offset).Limit(limit).Find(&list).Error
+	return list, total, err
+}
+
+func GetObjectRegistrationByIdList(id int64) (models.XtDialysisRegistration, error) {
+
+	registration := models.XtDialysisRegistration{}
+	err := XTReadDB().Where("id = ? and status=1", id).Find(&registration).Error
+	return registration, err
+
+}
+
+func UpdateObjectRegistration(registration models.XtDialysisRegistration) error {
+
+	err := XTWriteDB().Save(&registration).Error
+
+	return err
+}
+
+func DeleteObjectTregistration(id int64) error {
+
+	err := XTWriteDB().Model(&models.XtDialysisRegistration{}).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}

service/mobile_dialysis_service.go

@@ -2637,17 +2637,10 @@ func GetDialysisPrescribe(orgID int64, patientID int64, recordDate int64) (*mode
 }
 
 // 透析方案
-func GetDialysisSolution(orgID int64, patientID int64, mode_id int64) (*models.DialysisSolution, error) {
+func GetDialysisSolution(orgID int64, patientID int64, mode_id int64) (models.DialysisSolution, error) {
 	var record models.DialysisSolution
 	err := readDb.Model(&models.DialysisSolution{}).Where("patient_id = ? and user_org_id = ? and status = 1 AND mode_id = ?", patientID, orgID, mode_id).Last(&record).Error
-	if err != nil {
-		if err == gorm.ErrRecordNotFound {
-			return nil, nil
-		} else {
-			return nil, err
-		}
-	}
-	return &record, nil
+	return record, err
 }
 
 func GetDialysisSolutionOne(orgID int64, mode_id int64) (*models.DialysisSolution, error) {
@@ -7244,3 +7237,306 @@ func GetPatientDryWeight(org_id int64, patient_id int64) (weight []*models.SgjPa
 
 	return weight, err
 }
+
+func MobileGetLongScheduleDoctorAdvices(orgID int64, scheduleDate int64, adviceType int, patientType int, adminUserId int64, deliverWay string, scheduleType int64, partitonType int64, patient_id int64, execution_state int64, cost_type int64, execution_frequency string) ([]*MScheduleDoctorAdviceVM, error) {
+
+	var vms []*MScheduleDoctorAdviceVM
+	adviceWhere := ""
+	adviceCondition := []interface{}{}
+	if adviceType == 1 {
+		if patientType == 0 {
+			if patient_id > 0 {
+				if execution_state > 0 {
+					if cost_type > 0 {
+						if len(execution_frequency) > 0 {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  and patient_id = ? and execution_state = ? and is_settle = ? and execution_frequency = ?"
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, execution_state, cost_type, execution_frequency)
+						} else {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 and patient_id = ? and execution_state = ? and is_settle = ?"
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, execution_state, cost_type)
+						}
+
+					} else {
+						if len(execution_frequency) > 0 {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 and patient_id = ? and execution_state = ? and execution_frequency = ?"
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, execution_state, execution_frequency)
+						} else {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  and patient_id = ? and execution_state = ?"
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, execution_state)
+						}
+
+					}
+
+				} else {
+					if cost_type > 0 {
+						if len(execution_frequency) > 0 {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  and patient_id = ? and is_settle = ? and execution_frequency = ?"
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, cost_type, execution_frequency)
+						} else {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  and patient_id = ? and is_settle = ? "
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, cost_type)
+						}
+
+					} else {
+						if len(execution_frequency) > 0 {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 and patient_id = ? and execution_frequency = ?"
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, execution_frequency)
+						} else {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 and patient_id = ? "
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id)
+						}
+
+					}
+
+				}
+
+			} else {
+				if execution_state > 0 {
+					if cost_type > 0 {
+						if len(execution_frequency) > 0 {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  and execution_state = ? and is_settle = ? and execution_frequency = ?"
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, execution_state, cost_type, execution_frequency)
+						} else {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  and execution_state = ? and is_settle = ?"
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, execution_state, cost_type)
+						}
+
+					} else {
+						if len(execution_frequency) > 0 {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  and execution_state = ? and execution_frequency = ?"
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, execution_state, execution_frequency)
+						} else {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  and execution_state = ?"
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, execution_state)
+						}
+
+					}
+
+				} else {
+					if cost_type > 0 {
+						adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  and is_settle = ? "
+						adviceCondition = append(adviceCondition, adviceWhere, orgID, cost_type)
+					} else {
+						adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1   "
+						adviceCondition = append(adviceCondition, adviceWhere, orgID)
+					}
+
+				}
+
+			}
+
+		} else if patientType == 1 {
+			if patient_id > 0 {
+				if execution_state > 0 {
+					if cost_type > 0 {
+						if len(execution_frequency) > 0 {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND advice_doctor = ? and patient_id = ? and execution_state = ? and  is_settle = ? and execution_frequency = ?"
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, patient_id, execution_state, cost_type, execution_frequency)
+						} else {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND advice_doctor = ? and patient_id = ? and execution_state = ? and  is_settle = ?"
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, patient_id, execution_state, cost_type)
+						}
+
+					} else {
+						if len(execution_frequency) > 0 {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND advice_doctor = ? and patient_id = ? and execution_state = ? and execution_frequency = ?"
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, patient_id, execution_state, execution_frequency)
+						} else {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND advice_doctor = ? and patient_id = ? and execution_state = ?"
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, patient_id, execution_state)
+						}
+
+					}
+
+				} else {
+					if cost_type > 0 {
+						if len(execution_frequency) > 0 {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND advice_doctor = ? and patient_id = ? and is_settle = ?and execution_frequency = ?"
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, patient_id, cost_type, execution_frequency)
+						} else {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND advice_doctor = ? and patient_id = ? and is_settle = ?"
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, patient_id, cost_type)
+						}
+
+					} else {
+						if len(execution_frequency) > 0 {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND advice_doctor = ? and patient_id = ? and execution_frequency = ?"
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, patient_id, execution_frequency)
+						} else {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND advice_doctor = ? and patient_id = ?"
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, patient_id)
+						}
+
+					}
+
+				}
+
+			} else {
+				if execution_state > 0 {
+					if cost_type > 0 {
+						if len(execution_frequency) > 0 {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND advice_doctor = ? and execution_state=? and is_settle = ?and execution_frequency = ?"
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, execution_state, cost_type, execution_frequency)
+						} else {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND advice_doctor = ? and execution_state=? and is_settle = ?"
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, execution_state, cost_type)
+						}
+
+					} else {
+						if len(execution_frequency) > 0 {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND advice_doctor = ? and execution_state=?and execution_frequency = ?"
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, execution_state, execution_frequency)
+						} else {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND advice_doctor = ? and execution_state=?"
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, execution_state)
+						}
+
+					}
+
+				} else {
+					if cost_type > 0 {
+						if len(execution_frequency) > 0 {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND advice_doctor = ? and  is_settle = ? and execution_frequency = ?"
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, cost_type, execution_frequency)
+						} else {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND advice_doctor = ? and  is_settle = ? "
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, cost_type)
+						}
+
+					} else {
+						if len(execution_frequency) > 0 {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND advice_doctor = ? and execution_frequency = ?"
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, execution_frequency)
+						} else {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND advice_doctor = ? "
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId)
+						}
+
+					}
+
+				}
+
+			}
+
+		} else if patientType == 2 {
+			if patient_id > 0 {
+				if execution_state > 0 {
+					if cost_type > 0 {
+						if len(execution_frequency) > 0 {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND execution_staff = 0 and patient_id = ? and execution_state = ? and is_settle = ?and execution_frequency = ?"
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, execution_state, cost_type, execution_frequency)
+						} else {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND execution_staff = 0 and patient_id = ? and execution_state = ? and is_settle = ?"
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, execution_state, cost_type)
+						}
+
+					} else {
+						if len(execution_frequency) > 0 {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND execution_staff = 0 and patient_id = ? and execution_state = ? and execution_frequency = ?"
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, execution_state, execution_frequency)
+						} else {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND execution_staff = 0 and patient_id = ? and execution_state = ?"
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, execution_state)
+						}
+
+					}
+
+				} else {
+					if cost_type > 0 {
+						if len(execution_frequency) > 0 {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND execution_staff = 0 and patient_id = ? and is_settle = ? and execution_frequency = ?"
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, cost_type, execution_frequency)
+						} else {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND execution_staff = 0 and patient_id = ? and is_settle = ?"
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, cost_type)
+						}
+
+					} else {
+						if len(execution_frequency) > 0 {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND execution_staff = 0 and patient_id = ?  and execution_frequency = ?"
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, execution_frequency)
+						} else {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND execution_staff = 0 and patient_id = ?"
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id)
+						}
+
+					}
+
+				}
+			} else {
+				if execution_state > 0 {
+
+					if cost_type > 0 {
+						if len(execution_frequency) > 0 {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1AND execution_staff = 0 and execution_state = ? and is_settle = ? and execution_frequency = ?"
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, execution_state, cost_type, execution_frequency)
+						} else {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1AND execution_staff = 0 and execution_state = ? and is_settle = ?"
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, execution_state, cost_type)
+						}
+
+					} else {
+						if len(execution_frequency) > 0 {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND execution_staff = 0 and execution_state = ? and execution_frequency = ?"
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, execution_state, execution_frequency)
+						} else {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND execution_staff = 0 and execution_state = ?"
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, execution_state)
+						}
+
+					}
+
+				} else {
+
+					if cost_type > 0 {
+						if len(execution_frequency) > 0 {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND execution_staff = 0 and is_settle = ? and execution_frequency = ?"
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, cost_type, execution_frequency)
+						} else {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND execution_staff = 0 and is_settle = ?"
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, cost_type)
+						}
+
+					} else {
+						if len(execution_frequency) > 0 {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND execution_staff = 0 and execution_frequency = ?"
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, execution_frequency)
+						} else {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND execution_staff = 0"
+							adviceCondition = append(adviceCondition, adviceWhere, orgID)
+						}
+
+					}
+
+				}
+
+			}
+
+		}
+
+	}
+
+	db := readDb.Table("xt_schedule")
+	if scheduleType > 0 {
+		db = db.Where("schedule_type = ?", scheduleType)
+	}
+	if partitonType > 0 {
+		db = db.Where("partition_id = ?", partitonType)
+	}
+	db = db.Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+		Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+		}).
+		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+		Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+		Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+		Preload("DialysisAssesmentBefor", "status =1 AND user_org_id = ? and assessment_date =?", orgID, scheduleDate).
+		Preload("DoctorAdvices", adviceCondition...).
+		Where("status = 1 AND user_org_id = ?", orgID)
+	if scheduleDate != 0 {
+		db = db.Where("schedule_date = ?", scheduleDate)
+	}
+
+	err := db.Find(&vms).Error
+	return vms, err
+}

service/patient_service.go

@@ -12,7 +12,7 @@ import (
 )
 
 // GetPatientList 返回患者的列表
-func GetPatientList(orgID int64, keywords string, page, limit, schedulType, bindingState, lapseto, source, startTime, endTime, contagion, reimbursementWay, isscheduling, isprescription int64, isStartTime, isEndTime bool) (patients []*models.Patients, total int64, err error) {
+func GetPatientList(orgID int64, keywords string, page, limit, schedulType, bindingState, lapseto, source, startTime, endTime, contagion, reimbursementWay, isscheduling, isprescription int64, isStartTime, isEndTime bool, patientSoureType int64) (patients []*models.Patients, total int64, err error) {
 
 	db := readDb.Table("xt_patients as p").Where("p.status=1")
 	if orgID > 0 {
@@ -65,6 +65,10 @@ func GetPatientList(orgID int64, keywords string, page, limit, schedulType, bind
 		db = db.Where("p.created_time<=?", endTime)
 	}
 
+	if patientSoureType > 0 {
+		db = db.Where("p.patient_source =?", patientSoureType)
+	}
+
 	offset := (page - 1) * limit
 	if lapseto == 2 || lapseto == 3 {
 		err = db.Order("p.death_time desc").Select(" p.id, p.user_org_id, p.user_id, p.patient_type, p.dialysis_no, p.admission_number, p.source, p.lapseto, p.partition_id, p.bed_id, p.name, p.alias, p.gender, p.marital_status, p.id_card_no, p.birthday, p.reimbursement_way_id, p.health_care_type, p.health_care_no, p.health_care_due_date, p.height, p.blood_type, p.rh, p.health_care_due_alert_date, p.education_level, p.profession, p.phone, p.home_telephone, p.relative_phone, p.relative_relations, p.home_address, p.work_unit, p.unit_address, p.children, p.receiving_date, p.is_hospital_first_dialysis, p.first_dialysis_date, p.first_dialysis_hospital, p.induction_period, p.initial_dialysis, p.total_dialysis, p.attending_doctor_id, p.head_nurse_id, p.evaluate, p.diagnose, p.remark, p.registrars_id, p.registrars, p.qr_code, p.binding_state, p.status, p.created_time, p.updated_time,p.user_sys_before_count,p.out_reason,p.death_time,p.is_infectious").Group("p.id").Count(&total).Offset(offset).Limit(limit).Find(&patients).Error
@@ -512,7 +516,6 @@ func GetPatientCount(orgID int64) (total int64) {
 	readDb.Model(&models.Patients{}).Where("user_org_id=? and status=1 and lapseto = 1", orgID).Count(&total)
 	return
 }
-
 func GetLapsetoPatientCount(orgID int64, lapseto int64) (total int64) {
 	readDb.Model(&models.Patients{}).Where("user_org_id=? and lapseto=? and status=1", orgID, lapseto).Count(&total)
 	return
@@ -871,7 +874,7 @@ func UpdatePatientLapseto(patientid int64, lapseto models.PatientLapseto) error
 func UpdatepatientTwo(patientsNew *models.XtPatientsNew, id int64) error {
 
 	err := XTWriteDB().Model(&patientsNew).Where("blood_id = ?", id).Update(map[string]interface{}{"user_org_id": patientsNew.UserOrgId, "user_id": patientsNew.UserId, "avatar": patientsNew.Avatar, "patient_type": patientsNew.Avatar, "dialysis_no": patientsNew.DialysisNo, "admission_number": patientsNew.AdmissionNumber, "source": patientsNew.Source, "lapseto": patientsNew.Lapseto, "partition_id": patientsNew.PartitionId, "bed_id": patientsNew.BedId, "name": patientsNew.Name, "alias": patientsNew.Alias, "gender": patientsNew.Gender, "marital_status": patientsNew.MaritalStatus, "id_card_no": patientsNew.IdCardNo, "birthday": patientsNew.Birthday, "reimbursement_way_id": patientsNew.ReimbursementWayId, "health_care_type": patientsNew.HealthCareType, "health_care_no": patientsNew.HealthCareType, "health_care_due_date": patientsNew.HealthCareType, "height": patientsNew.Height, "blood_type": patientsNew.BloodType, "rh": patientsNew.Rh, "health_care_due_alert_date": patientsNew.HealthCareDueAlertDate, "education_level": patientsNew.EducationLevel, "profession": patientsNew.Profession, "phone": patientsNew.Phone, "home_telephone": patientsNew.HomeTelephone, "relative_phone": patientsNew.RelativePhone, "relative_relations": patientsNew.RelativeRelations, "home_address": patientsNew.HomeAddress, "work_unit": patientsNew.WorkUnit, "unit_address": patientsNew.UnitAddress, "children": patientsNew.Children, "receiving_date": patientsNew.ReceivingDate, "is_hospital_first_dialysis": patientsNew.IsHospitalFirstDialysis, "first_dialysis_date": patientsNew.FirstDialysisDate, "first_dialysis_hospital": patientsNew.FirstDialysisHospital, "predialysis_condition": patientsNew.PredialysisCondition, "pre_hospital_dialysis_frequency": patientsNew.PreHospitalDialysisFrequency, "pre_hospital_dialysis_times": patientsNew.PreHospitalDialysisFrequency, "hospital_first_dialysis_date": patientsNew.HospitalFirstDialysisDate, "induction_period": patientsNew.InductionPeriod, "initial_dialysis": patientsNew.InitialDialysis, "total_dialysis": patientsNew.TotalDialysis, "attending_doctor_id": patientsNew.AttendingDoctorId, "head_nurse_id": patientsNew.HeadNurseId, "evaluate": patientsNew.Evaluate, "diagnose": patientsNew.Diagnose, "remark": patientsNew.Remark, "registrars_id": patientsNew.RegistrarsId, "registrars": patientsNew.Registrars, "qr_code": patientsNew.QrCode, "binding_state": patientsNew.BindingState, "patient_complains": patientsNew.PatientComplains, "present_history": patientsNew.PresentHistory, "past_history": patientsNew.PastHistory, "temperature": patientsNew.Temperature,
-		"pulse": patientsNew.Pulse, "respiratory": patientsNew.Respiratory, "sbp": patientsNew.Sbp, "dbp": patientsNew.Dbp, "nation": patientsNew.Nation, "native_place": patientsNew.NativePlace, "age": patientsNew.Age, "infectious_next_record_time": patientsNew.InfectiousNextRecordTime, "is_infectious": patientsNew.IsInfectious, "remind_cycle": patientsNew.RemindCycle, "response_result": patientsNew.ResponseResult, "is_open_remind": patientsNew.IsOpenRemind, "first_treatment_date": patientsNew.FirstTreatmentDate, "dialysis_age": patientsNew.DialysisAge, "expense_kind": patientsNew.ExpenseKind, "tell_phone": patientsNew.ExpenseKind, "contact_name": patientsNew.ContactName, "blood_patients": patientsNew.BloodPatients, "slow_patients": patientsNew.SlowPatients, "member_patients": patientsNew.MemberPatients, "ecommer_patients": patientsNew.EcommerPatients, "troble_shoot": patientsNew.TrobleShoot, "sch_remark": patientsNew.SchRemark, "treatment_plan": patientsNew.TreatmentPlan, "record_number": patientsNew.RecordNumber}).Error
+		"pulse": patientsNew.Pulse, "respiratory": patientsNew.Respiratory, "sbp": patientsNew.Sbp, "dbp": patientsNew.Dbp, "nation": patientsNew.Nation, "native_place": patientsNew.NativePlace, "age": patientsNew.Age, "infectious_next_record_time": patientsNew.InfectiousNextRecordTime, "is_infectious": patientsNew.IsInfectious, "remind_cycle": patientsNew.RemindCycle, "response_result": patientsNew.ResponseResult, "is_open_remind": patientsNew.IsOpenRemind, "first_treatment_date": patientsNew.FirstTreatmentDate, "dialysis_age": patientsNew.DialysisAge, "expense_kind": patientsNew.ExpenseKind, "tell_phone": patientsNew.ExpenseKind, "contact_name": patientsNew.ContactName, "blood_patients": patientsNew.BloodPatients, "slow_patients": patientsNew.SlowPatients, "member_patients": patientsNew.MemberPatients, "ecommer_patients": patientsNew.EcommerPatients, "troble_shoot": patientsNew.TrobleShoot, "sch_remark": patientsNew.SchRemark, "treatment_plan": patientsNew.TreatmentPlan, "record_number": patientsNew.RecordNumber, "patient_start_time": patientsNew.PatientStartTime}).Error
 	return err
 }
 
@@ -2667,7 +2670,7 @@ func GetAllPatientListByListOne(orgID int64) (patients []*models.VMMonitorPatien
 	defer redis.Close()
 	key := strconv.FormatInt(orgID, 10) + ":" + ":patient_list_all"
 	patient_info_str, _ := redis.Get(key).Result()
-
+	redis.Set(key, "", time.Second)
 	if len(patient_info_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		err = readDb.Model(&models.VMMonitorPatients{}).Where("user_org_id=? and status=1", orgID).Find(&patients).Error
 		if err != nil {
@@ -2895,3 +2898,43 @@ func UpdateScheduleByExport(org_id int64, shcheduledate int64) error {
 	err := XTWriteDB().Model(models.XtSchedule{}).Where("user_org_id = ? and schedule_date > ?", org_id, shcheduledate).Updates(map[string]interface{}{"status": 0}).Error
 	return err
 }
+
+func GetContextScheduleListGroupPatientId(limit int64, page int64, startTime int64, endTime int64, org_id int64) (schedule []*models.ConScheduleList, total int64, err error) {
+
+	db := XTReadDB().Model(&schedule).Where("status=1")
+
+	offset := (page - 1) * limit
+
+	if startTime > 0 {
+		db = db.Where("schedule_date >=?", startTime)
+	}
+	if endTime > 0 {
+		db = db.Where("schedule_date<=?", endTime)
+	}
+
+	if org_id > 0 {
+		db = db.Where("user_org_id = ?", org_id)
+	}
+	err = db.Count(&total).Offset(offset).Limit(limit).Group("patient_id").Find(&schedule).Error
+
+	return schedule, total, err
+}
+
+func GetContextScheduleListPatientId(startTime int64, endTime int64, org_id int64) (schedule []*models.ConScheduleList, total int64, err error) {
+
+	db := XTReadDB().Model(&schedule).Where("status=1")
+
+	if startTime > 0 {
+		db = db.Where("schedule_date >=?", startTime)
+	}
+	if endTime > 0 {
+		db = db.Where("schedule_date<=?", endTime)
+	}
+
+	if org_id > 0 {
+		db = db.Where("user_org_id = ?", org_id)
+	}
+	err = db.Find(&schedule).Error
+
+	return schedule, total, err
+}

service/self_drug_service.go

@@ -1119,6 +1119,29 @@ func GetDrugInventoryDetailList(keyword string, page int64, limit int64, orgid i
 	return list, total, err
 }
 
+func GetDrugInventoryDetailMapList(keyword string, page int64, limit int64, orgid int64, storehouse_id int64, ids []string) (list []*models.VmDrugInventory, total int64, err error) {
+	likeKey := "%" + keyword + "%"
+	offset := (page - 1) * limit
+	db := XTReadDB().Table("xt_drug_inventory as x").Where("x.status = 1")
+	table := XTReadDB().Table("xt_base_drug as t").Where("t.status = 1")
+	tab := UserReadDB().Table("sgj_user_admin_role as r").Where("r.status = 1")
+	fmt.Println(table, tab)
+	if len(keyword) > 0 {
+		db = db.Where("x.warehousing_order = ? or r.user_name like ? or t.drug_name like ?", keyword, likeKey, likeKey)
+	}
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ?", orgid)
+	}
+	if storehouse_id > 0 {
+		db = db.Where("x.storehouse_id = ?", storehouse_id)
+	}
+	if len(ids) > 0 {
+		db = db.Where("x.id in(?)", ids)
+	}
+	err = db.Select("x.id,x.drug_name,x.specification_name,x.warehousing_unit,x.count,x.last_price,x.retail_price,x.manufacturer,x.dealer,x.remark,x.drug_id,x.warehousing_order,x.number,x.batch_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.total,x.drug_origin_place,x.expiry_date,x.product_date,x.min_count,x.storehouse_id,x.warehouse_info_id,t.dose,t.dose_unit,t.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.last_stock_max_number,x.last_stock_min_number,x.inventory_type,t.min_number,t.retail_price").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_base_drug as t on t.id =x.drug_id").Count(&total).Offset(offset).Limit(limit).Scan(&list).Error
+	return list, total, err
+}
+
 func GetDrugInventoryDetailListTwo(keyword string, page int64, limit int64, orgid int64, storehouse_id int64) (list []*models.XtDrugInventory, total int64, err error) {
 
 	db := XTReadDB().Model(&list).Where("status = 1")
@@ -2715,6 +2738,6 @@ func ModifyDrugFlowById(id int64, over_count int64) error {
 
 func GetDrugInventoryWarehouseInfoList(org_id int64, storehouse_id int64) (info []*models.XtDrugWarehouseInfo, err error) {
 
-	err = XTReadDB().Model(&info).Where("status = 1 and storehouse_id = ? and is_check = 1 and org_id = ?", storehouse_id, org_id).Preload("XtBaseDrug", "status= 1").Find(&info).Error
+	err = XTReadDB().Model(&info).Where("status = 1 and storehouse_id = ? and is_check = 1 and org_id = ? and (stock_max_number >0 or stock_min_number >0)", storehouse_id, org_id).Preload("XtBaseDrug", "status= 1").Order("drug_id").Find(&info).Error
 	return info, err
 }

service/stock_service.go

@@ -6113,6 +6113,30 @@ func GetInventoryDetailList(keyword string, limit int64, page int64, orgid int64
 	return list, total, err
 }
 
+func GetInventoryDetailPrintMapList(keyword string, limit int64, page int64, orgid int64, storehouse_id int64, ids []string) (list []*models.VmStockInventory, total int64, err error) {
+
+	likeKey := "%" + keyword + "%"
+	offset := (page - 1) * limit
+	db := XTReadDB().Table("xt_stock_inventory as x").Where("x.status = 1 and x.type = 10")
+	table := XTReadDB().Table("xt_good_information as t").Where("t.status = 1")
+	tab := UserReadDB().Table("sgj_user_admin_role as r").Where("r.status = 1")
+	fmt.Println(table, tab)
+	if len(keyword) > 0 {
+		db = db.Where("x.good_name like ?", likeKey)
+	}
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ?", orgid)
+	}
+	if storehouse_id > 0 {
+		db = db.Where("x.storehouse_id = ?", storehouse_id)
+	}
+	if len(ids) > 0 {
+		db = db.Where("x.id in(?)", ids)
+	}
+	err = db.Select("x.id,x.good_name,x.specification_name,x.warehousing_unit,x.count,x.buy_price,x.packing_price,x.new_price,x.manufacturer,x.dealer,x.remark,x.good_id,x.warehousing_order,x.license_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.total,x.number,x.expire_date,x.product_date,t.packing_unit,x.last_stock_count,x.type,x.inventory_type,x.stock_count,x.storehouse_id").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_good_information as t on t.id =x.good_id").Count(&total).Offset(offset).Limit(limit).Scan(&list).Error
+	return list, total, err
+}
+
 func GetInventoryPrintList(ids []string) (list []*models.XtStockInventory, err error) {
 
 	err = XTReadDB().Where("id in(?) and status = 1", ids).Find(&list).Error
@@ -8212,7 +8236,7 @@ func ReduceGoodSumOutCount(storehouse_id int64, good_id int64, user_org_id int64
 
 func GetInvetoryWarehouseInfoList(orgid int64, storehouse_id int64) (info []*models.WarehousingInfo, err error) {
 
-	err = XTReadDB().Model(&info).Where("status = 1 and storehouse_id=? and is_check= 1 and org_id = ?", storehouse_id, orgid).Preload("GoodInfo", "status = 1").Find(&info).Error
+	err = XTReadDB().Model(&info).Where("status = 1 and storehouse_id=? and is_check= 1 and org_id = ? and stock_count >0", storehouse_id, orgid).Preload("GoodInfo", "status = 1").Order("good_id").Find(&info).Error
 	return info, err
 }
 
@@ -8602,3 +8626,14 @@ func UpdateWarehouseInfoMap(list []*models.WarehousingInfo, warehousing_info_id
 	return err
 
 }
+
+func FindFirstWarehousingInfoByStockThree(good_id int64, storehouse_id int64) (info models.WarehousingInfo, err error) {
+	if storehouse_id == 0 {
+		err = readDb.Model(&models.WarehousingInfo{}).Where("good_id = ? AND status = 1 and stock_count > 0", good_id).Order("ctime").First(&info).Error
+	}
+	if storehouse_id > 0 {
+		err = readDb.Model(&models.WarehousingInfo{}).Where("good_id = ?  AND status = 1 and stock_count > 0 and storehouse_id =? ", good_id, storehouse_id).Order("ctime").First(&info).Error
+	}
+
+	return info, err
+}

service/user_service.go

@@ -189,7 +189,7 @@ func GetAllData(orgid int64, id int64, page int64, limit int64) (dry []*models.X
 	offset := (page - 1) * limit
 	table := XTReadDB().Table("sgj_users.sgj_user_admin_role AS a")
 	fmt.Println("table", table)
-	err = XTReadDB().Table("xt_patient_dryweight as x").Select("x.id,x.dry_weight,x.creator,x.remakes,x.patient_id,x.ctime,x.status,x.user_org_id,x.adjusted_value,a.user_name").Where("x.user_org_id = ? AND x.patient_id = ? AND x.status = ? ", orgid, id, 1).Count(&total).Joins("LEFT  JOIN sgj_users.sgj_user_admin_role AS a ON a.admin_user_id = x.creator").Order("x.ctime desc").Offset(offset).Limit(limit).Group("id").Scan(&dry).Error
+	err = XTReadDB().Table("xt_patient_dryweight as x").Select("x.id,x.dry_weight,x.creator,x.remakes,x.patient_id,x.ctime,x.status,x.user_org_id,x.adjusted_value,a.user_name").Where("x.user_org_id = ? AND x.patient_id = ? AND x.status = ?", orgid, id, 1).Count(&total).Joins("LEFT  JOIN sgj_users.sgj_user_admin_role AS a ON a.admin_user_id = x.creator").Order("x.ctime desc").Offset(offset).Limit(limit).Group("id").Scan(&dry).Error
 	if err != nil {
 		return
 	}