11月9日库存管理

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9529
+httpport = 9531
 runmode = dev
 #dev/prod
 

controllers/dialysis_api_controller.go

@@ -97,6 +97,8 @@ func DialysisApiRegistRouters() {
 	beego.Router("/api/schedule/getpatientshedule", &DialysisApiController{}, "Get:GetPatientSchedule")
 
 	beego.Router("/api/patient/getscheduleprintlist", &DialysisApiController{}, "Get:GetSchedulePrintList")
+
+	beego.Router("/api/patient/getsolutionlistbyorgid", &DialysisApiController{}, "Get:GetSolutionListByOrgId")
 }
 
 func (c *DialysisApiController) GetQueueCall() {
@@ -4302,6 +4304,13 @@ func (this *DialysisApiController) GetPatientDialysisSolutionGroupList() {
 	schedule_type, _ := this.GetInt64("schedule_type")
 
 	start_time := this.GetString("schedule_date")
+
+	advice_ids := this.GetString("ids")
+	var ids []string
+	if advice_ids != "" {
+		ids = strings.Split(advice_ids, ",")
+	}
+
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
@@ -4311,7 +4320,7 @@ func (this *DialysisApiController) GetPatientDialysisSolutionGroupList() {
 
 	goodType, _ := service.GetAllGoodType(orgId)
 	if config.IsOpen != 1 {
-		list, total, err := service.GetPatientDialysisSolutionGroupList(keyword, limit, page, partition_id, schedule_type, startTime.Unix(), orgId)
+		list, total, err := service.GetPatientDialysisSolutionGroupList(keyword, limit, page, partition_id, schedule_type, startTime.Unix(), orgId, ids)
 		fmt.Println("list2232323223332323232", list)
 		if err == nil {
 			this.ServeSuccessJSON(map[string]interface{}{
@@ -4328,7 +4337,7 @@ func (this *DialysisApiController) GetPatientDialysisSolutionGroupList() {
 		}
 	}
 	if config.IsOpen == 1 {
-		list, total, err := service.GetHisPatientDialysisSolutionGroupList(keyword, limit, page, partition_id, schedule_type, startTime.Unix(), orgId)
+		list, total, err := service.GetHisPatientDialysisSolutionGroupList(keyword, limit, page, partition_id, schedule_type, startTime.Unix(), orgId, ids)
 		if err == nil {
 			this.ServeSuccessJSON(map[string]interface{}{
 				"list":     list,
@@ -4358,32 +4367,35 @@ func (this *DialysisApiController) GetDialysisAdviceTemplateList() {
 	start_time := this.GetString("schedule_date")
 
 	ids := this.GetString("ids")
-	idArray := strings.Split(ids, ",")
+
+	var idArray []string
+	if ids != "" {
+		idArray = strings.Split(ids, ",")
+	}
+
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 
 	orgId := this.GetAdminUserInfo().CurrentOrgId
-	fmt.Println("idArray", idArray)
+
 	list, total, err := service.GetDialysisAdviceTemplateList(keyword, limit, page, partition_id, schedule_type, startTime.Unix(), orgId, idArray)
-	fmt.Println("list2323223323223323323223wi", list)
+
+	tablelist, _, err := service.GetDialysisAdviceSchedulistSix(keyword, limit, page, partition_id, schedule_type, startTime.Unix(), orgId, idArray)
 	//获取长期医嘱
 	adviceList, _ := service.GetAllLongAdviceList(orgId)
 
-	//获取医嘱模版
-	templateList, _ := service.GetAllHisAdviceTemplateList(orgId)
-
 	_, config := service.FindXTHisRecordByOrgId(orgId)
 
-	drugList, _ := service.GetAllBaseDrugList(orgId)
+	drugList, _ := service.GetAllBaseDrugListTwenty(orgId)
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
-			"list":         list,
-			"total":        total,
-			"adviceList":   adviceList,
-			"templateList": templateList,
-			"config":       config,
-			"drugList":     drugList,
+			"list":       list,
+			"total":      total,
+			"adviceList": adviceList,
+			"config":     config,
+			"drugList":   drugList,
+			"tablelist":  tablelist,
 		})
 		return
 
@@ -4499,7 +4511,12 @@ func (this *DialysisApiController) GetDialysisParameterList() {
 
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 
-	list, total, err := service.GetDialysisParameterList(keyword, limit, page, partition_id, schedule_type, startTime.Unix(), orgId)
+	scheduids := this.GetString("ids")
+	var ids []string
+	if scheduids != "" {
+		ids = strings.Split(scheduids, ",")
+	}
+	list, total, err := service.GetDialysisParameterList(keyword, limit, page, partition_id, schedule_type, startTime.Unix(), orgId, ids)
 
 	dialysisSett, _ := service.GetDialysisSetting(orgId)
 	if err == nil {
@@ -4556,20 +4573,21 @@ func (this *DialysisApiController) GetDialysisAdviceSchedulist() {
 	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 
 	list, err := service.GetDialysisAdviceSchedulist(orgId, schedule_type, partion_type, startTime.Unix())
-	drug, _ := service.GetAllDrugMap(orgId)
+
+	tablelist, _ := service.GetDialysisAdviceSchedulistTwo(orgId, schedule_type, partion_type, startTime.Unix())
+
 	//获取长期医嘱
 	adviceList, _ := service.GetAllLongAdviceList(orgId)
-	//获取医嘱模版
-	templateList, _ := service.GetAllHisAdviceTemplateList(orgId)
 
+	drug, _ := service.GetAllBaseDrugListTwenty(orgId)
 	_, config := service.FindXTHisRecordByOrgId(orgId)
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
-			"list":         list,
-			"drug":         drug,
-			"adviceList":   adviceList,
-			"templateList": templateList,
-			"config":       config,
+			"list":       list,
+			"drug":       drug,
+			"adviceList": adviceList,
+			"config":     config,
+			"tablelist":  tablelist,
 		})
 		return
 
@@ -4687,3 +4705,20 @@ func (c *DialysisApiController) GetSchedulePrintList() {
 	})
 
 }
+
+func (this *DialysisApiController) GetSolutionListByOrgId() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	list, _ := service.GetSolutionListByOrgId(orgId)
+	for _, item := range list {
+		//获取该模式最新的1条数据
+		solution, _ := service.GetNewPatientSolutionByModeId(item.PatientId, item.ModeId, orgId)
+
+		//更新状态值
+		service.UpdateDialysisSolutionStatus(solution.ID, item.ModeId, orgId, item.PatientId)
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+
+}

controllers/his_api_controller.go

@@ -5101,7 +5101,9 @@ func (c *HisApiController) GetUploadInfo() {
 			tx.Commit()
 		}
 	}()
-	if dec_way == "true" && tmp_decimal == "0" || dec_way == "true" && tmp_decimal == "" {
+	fmt.Println("dec_way", dec_way)
+	if (dec_way == "true" && tmp_decimal == "0") || (dec_way == "true" && tmp_decimal == "") {
+		fmt.Println("tru23332322323323232232332即那里")
 		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "押金不能为0")
 		return
 	}
@@ -5296,6 +5298,9 @@ func (c *HisApiController) GetUploadInfo() {
 				customs = append(customs, cus)
 			}
 		}
+
+		//判断库存的地方
+
 		for _, item := range customs {
 			var advice_id int64 = 0
 			var project_id int64 = 0
@@ -5352,6 +5357,7 @@ func (c *HisApiController) GetUploadInfo() {
 		if dec_way == "true" {
 
 			tmpstring := strconv.FormatInt(order.ID, 10)
+			fmt.Println("tmpstring222222222", order.ID)
 			//扣押金
 			errmsg = service.SpendDeposit(c.GetAdminUserInfo().CurrentOrgId, id, c.GetAdminUserInfo().AdminUser.Id, tmpstring, decimal)
 			order.Decimal = decimal
@@ -5362,7 +5368,49 @@ func (c *HisApiController) GetUploadInfo() {
 				return
 			}
 		}
+		fmt.Println("err233232233232323232wo", err)
+
 		if err == nil {
+
+			houseConfig, _ := service.GetAllStoreHouseConfig(adminUser.CurrentOrgId)
+			var goods []*models.DialysisBeforePrepareGoods
+			var newGoods []*models.NewDialysisBeforePrepareGoods
+			var infos []*models.HisDoctorAdviceInfo
+
+			for _, info := range prescriptions {
+				if info.Type == 1 {
+					infos = append(infos, info.HisDoctorAdviceInfo...)
+				}
+				if info.Type == 2 {
+					for _, sumItem := range info.HisPrescriptionProject {
+						if sumItem.Type == 3 {
+							var good models.DialysisBeforePrepareGoods
+							var newGood models.NewDialysisBeforePrepareGoods
+							good.GoodId = sumItem.GoodInfo.ID
+							good.GoodTypeId = sumItem.GoodInfo.GoodTypeId
+							count, _ := strconv.Atoi(sumItem.Count)
+							good.Count = int64(count)
+							good.StorehouseId = houseConfig.StorehouseOutInfo
+							good.ProjectId = sumItem.ID
+							goods = append(goods, &good)
+
+							newGood.GoodId = sumItem.GoodInfo.ID
+							newGood.GoodTypeId = sumItem.GoodInfo.GoodTypeId
+							count2, _ := strconv.Atoi(sumItem.Count)
+							newGood.Count = int64(count2)
+							newGood.StorehouseId = houseConfig.StorehouseOutInfo
+							newGood.ProjectId = sumItem.ID
+							newGoods = append(newGoods, &newGood)
+						}
+
+					}
+
+				}
+			}
+			for _, item := range infos {
+				service.HisDrugsDelivery(item.UserOrgId, adminUser.AdminUser.Id, item)
+			}
+			service.ConsumablesDeliveryTotal(adminUser.CurrentOrgId, his.PatientId, his.RecordDate, goods, newGoods, adminUser.AdminUser.Id)
 			c.ServeSuccessJSON(map[string]interface{}{
 				"msg": "结算成功",
 			})
@@ -5393,6 +5441,46 @@ func (c *HisApiController) GetUploadInfo() {
 				return
 			}
 			if err == nil {
+				houseConfig, _ := service.GetAllStoreHouseConfig(adminUser.CurrentOrgId)
+				var goods []*models.DialysisBeforePrepareGoods
+				var newGoods []*models.NewDialysisBeforePrepareGoods
+				var infos []*models.HisDoctorAdviceInfo
+
+				for _, info := range prescriptions {
+					if info.Type == 1 {
+						infos = append(infos, info.HisDoctorAdviceInfo...)
+					}
+					if info.Type == 2 {
+						for _, sumItem := range info.HisPrescriptionProject {
+							if sumItem.Type == 3 {
+								var good models.DialysisBeforePrepareGoods
+								var newGood models.NewDialysisBeforePrepareGoods
+								good.GoodId = sumItem.GoodInfo.ID
+								good.GoodTypeId = sumItem.GoodInfo.GoodTypeId
+								count, _ := strconv.Atoi(sumItem.Count)
+								good.Count = int64(count)
+								good.StorehouseId = houseConfig.StorehouseOutInfo
+								good.ProjectId = sumItem.ID
+								goods = append(goods, &good)
+
+								newGood.GoodId = sumItem.GoodInfo.ID
+								newGood.GoodTypeId = sumItem.GoodInfo.GoodTypeId
+								count2, _ := strconv.Atoi(sumItem.Count)
+								newGood.Count = int64(count2)
+								newGood.StorehouseId = houseConfig.StorehouseOutInfo
+								newGood.ProjectId = sumItem.ID
+								newGoods = append(newGoods, &newGood)
+							}
+
+						}
+
+					}
+				}
+				for _, item := range infos {
+					service.HisDrugsDelivery(item.UserOrgId, adminUser.AdminUser.Id, item)
+				}
+				service.ConsumablesDeliveryTotal(adminUser.CurrentOrgId, his.PatientId, his.RecordDate, goods, newGoods, adminUser.AdminUser.Id)
+
 				c.ServeSuccessJSON(map[string]interface{}{
 					"msg": "结算成功",
 				})
@@ -5421,6 +5509,53 @@ func (c *HisApiController) Refund() {
 			return
 		}
 	}
+
+	orders, _ := service.GetHisOrderDetailByNumberThree(order.Number, order.UserOrgId)
+	houseConfig, _ := service.GetAllStoreHouseConfig(order.UserOrgId)
+	var goods []*models.DialysisBeforePrepareGoods
+	var newGoods []*models.NewDialysisBeforePrepareGoods
+	var infos []*models.HisDoctorAdviceInfo
+
+	for _, info := range orders {
+		if info.AdviceId > 0 && info.ProjectId == 0 {
+			infos = append(infos, &info.HisDoctorAdviceInfo)
+		}
+		if info.ProjectId > 0 && info.AdviceId == 0 {
+			if info.HisPrescriptionProject.Type == 3 {
+				var good models.DialysisBeforePrepareGoods
+				var newGood models.NewDialysisBeforePrepareGoods
+				good.GoodId = info.HisPrescriptionProject.VMGoodInfo.ID
+				good.GoodTypeId = info.HisPrescriptionProject.VMGoodInfo.GoodTypeId
+				count, _ := strconv.Atoi(info.HisPrescriptionProject.Count)
+				good.Count = int64(count)
+				good.StorehouseId = houseConfig.StorehouseOutInfo
+				good.ProjectId = info.HisPrescriptionProject.ID
+
+				goods = append(goods, &good)
+
+				newGood.GoodId = info.HisPrescriptionProject.VMGoodInfo.ID
+				newGood.GoodTypeId = info.HisPrescriptionProject.VMGoodInfo.GoodTypeId
+				count2, _ := strconv.Atoi(info.HisPrescriptionProject.Count)
+				newGood.Count = int64(count2)
+				newGood.StorehouseId = houseConfig.StorehouseOutInfo
+				newGood.ProjectId = info.HisPrescriptionProject.ID
+				newGood.RecordDate = order.SettleAccountsDate
+				newGood.UserOrgId = order.UserOrgId
+				newGoods = append(newGoods, &newGood)
+			}
+		}
+	}
+	fmt.Println("infos2323232332233232323232w", infos)
+	for _, item := range infos {
+
+		service.DrugAutoAddCancelInfo(item, adminUser.AdminUser.Id)
+
+	}
+
+	for _, item := range newGoods {
+		service.GoodAutoAddCancelInfo(item, adminUser.AdminUser.Id)
+	}
+
 	c.ServeSuccessJSON(map[string]interface{}{
 		"msg": "退费成功",
 	})

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -194,9 +194,12 @@ func (this *DialysisAPIController) Scheduals() {
 				project, _ = service.GetAllHisProjectPrescription(orgID, date.Unix())
 			}
 
+			list, _ := service.GetZoneCountList(orgID, date.Unix())
+
 			this.ServeSuccessJSON(map[string]interface{}{
 				"scheduals": scheduals,
 				"project":   project,
+				"list":      list,
 			})
 		}
 
@@ -215,12 +218,13 @@ func (this *DialysisAPIController) Scheduals() {
 		if configs.ID > 0 && configs.IsOpen == 1 {
 			project, _ = service.GetAllHisProjectPrescription(orgID, date.Unix())
 		}
-
+		list, _ := service.GetZoneCountList(orgID, date.Unix())
 		this.ServeSuccessJSON(map[string]interface{}{
 			"scheduals": dat,
 			"redis":     "true",
 			"date":      schedualDate,
 			"project":   project,
+			"list":      list,
 		})
 
 	}
@@ -2800,6 +2804,7 @@ func (c *DialysisAPIController) PostSolution() {
 		EpoCount:                   epo_count,
 		MaxUltrafiltrationRate:     max_ultrafiltration_rate,
 		PreImpulse:                 impulse,
+		SolutionStatus:             1,
 	}
 
 	//针对河间咸的
@@ -6978,3 +6983,41 @@ func (this *DialysisAPIController) GetDialysisRecordOrder() {
 		"order": order,
 	})
 }
+
+func (this *DialysisAPIController) GetScheduleTypeByIdList() {
+
+	org_id := this.GetMobileAdminUserInfo().Org.Id
+	fmt.Println("org_id23323322332323233232", org_id)
+	schedule_date := this.GetString("schedule_date")
+	schedule_type, _ := this.GetInt64("schedule_type")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startdateunix int64
+	fmt.Println("schedule_date23323232233232323232", schedule_date)
+	if len(schedule_date) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+"15:04:05", schedule_date+"00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startdateunix = theTime.Unix()
+	}
+	fmt.Println("startdateunix", startdateunix)
+	list, _ := service.GetScheduleTypeById(org_id, startdateunix, schedule_type)
+	scheduals, _ := service.MobileGetDialysisScheduals(org_id, startdateunix, schedule_type)
+	devices, _ := service.GetAllDevicetByListSix(org_id)
+	for key, item := range scheduals {
+		// 床位信息
+		for _, device := range devices {
+			if item.BedId == device.ID {
+				scheduals[key].DeviceNumber = device
+				break
+			}
+		}
+
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":      list,
+		"scheduals": scheduals,
+	})
+}

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -173,4 +173,6 @@ func MobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/patient/getschedulebypatient", &DialysisAPIController{}, "Get:GetScheduleByPatient")
 
 	beego.Router("/m/api/getdialysisrecordeorder", &DialysisAPIController{}, "Get:GetDialysisRecordOrder")
+
+	beego.Router("/m/api/getscheduletypebyidlist", &DialysisAPIController{}, "Get:GetScheduleTypeByIdList")
 }

controllers/new_mobile_api_controllers/new_manage_api_controller.go

@@ -100,18 +100,39 @@ func (this *NewManageApiController) SaveDisInfectionInfo() {
 	orgid := adminUser.Org.Id
 	bedid, _ := this.GetInt64("bed_id")
 	start_time := this.GetString("start_time")
-	startdate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", start_time)
-	startdateunix := startdate.Unix()
+	//startdate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", start_time)
+	//startdateunix := startdate.Unix()
 	disinfectime, _ := this.GetInt64("disinfec_time")
 	endtime := this.GetString("end_time")
-	enddate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", endtime)
-	enddateunix := enddate.Unix()
+	//enddate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", endtime)
+	//enddateunix := enddate.Unix()
 
 	scheduledate, _ := this.GetInt64("schedule_date")
 	zoneid, _ := this.GetInt64("zone_id")
 	patientid, _ := this.GetInt64("patient_id")
 	modeid, _ := this.GetInt64("mode_id")
 	scheduletype, _ := this.GetInt64("schedule_type")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startdateunix int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04", start_time, loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startdateunix = theTime.Unix()
+	}
+	var enddateunix int64
+	if len(endtime) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04", endtime, loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		enddateunix = theTime.Unix()
+	}
 
 	//查询病人信息
 	patients, _ := service.GetPatientInfoMation(patientid)

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -752,17 +752,21 @@ func (c *StaffScheduleApiController) ChangeScheduleType() {
 	schedule_date, _ := c.GetInt64("schedule_date")
 	patient_id, _ := c.GetInt64("patient_id")
 	bed_id, _ := c.GetInt64("bed_id")
-	schedule_week, _ := c.GetInt64("schedule_week")
+	//schedule_week, _ := c.GetInt64("schedule_week")
 	mode_id, _ := c.GetInt64("mode_id")
 	id, _ := c.GetInt64("id")
 	org_id := c.GetMobileAdminUserInfo().Org.Id
 	//查询该班次该床位是否已经存在患者
 	schedule, _ := service.GetScheduleByClassType(schedule_type, schedule_date, bed_id, org_id)
 	//查询该床位所属分区
-	numberlist, _ := service.GetPartionId(bed_id, org_id)
+	//numberlist, _ := service.GetPartionId(bed_id, org_id)
 	//存在
 	if schedule.ID > 0 {
-
+		order, _ := service.GetDialysisOrder(schedule.ScheduleDate, schedule.PatientId, schedule.UserOrgId)
+		if order.ID > 0 {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSchedule)
+			return
+		}
 		//调换位置
 		sch := models.Schedule{
 			PatientId: schedule.PatientId,
@@ -778,20 +782,12 @@ func (c *StaffScheduleApiController) ChangeScheduleType() {
 
 	} else {
 		xtSchedule := models.Schedule{
-			UserOrgId:    org_id,
-			PartitionId:  numberlist.ZoneId,
-			BedId:        bed_id,
-			PatientId:    patient_id,
 			ScheduleDate: schedule_date,
 			ScheduleType: schedule_type,
-			ScheduleWeek: schedule_week,
-			ModeId:       mode_id,
-			Status:       1,
-			CreatedTime:  time.Now().Unix(),
-			UpdatedTime:  0,
-			IsExport:     0,
+			PatientId:    patient_id,
+			UserOrgId:    org_id,
 		}
-		service.CreateSchedule(&xtSchedule)
+		service.ChangeScheduleClass(xtSchedule)
 	}
 	c.ServeSuccessJSON(map[string]interface{}{
 		"msg": "ok",
@@ -800,7 +796,6 @@ func (c *StaffScheduleApiController) ChangeScheduleType() {
 
 func (c *StaffScheduleApiController) ChangeScheduleBed() {
 
-	fmt.Println("jin23323232233222323323232")
 	schedule_type, _ := c.GetInt64("schedule_type")
 	schedule_date, _ := c.GetInt64("schedule_date")
 	patient_id, _ := c.GetInt64("patient_id")
@@ -817,6 +812,11 @@ func (c *StaffScheduleApiController) ChangeScheduleBed() {
 	//存在
 	if schedule.ID > 0 {
 
+		order, _ := service.GetDialysisOrder(schedule.ScheduleDate, schedule.PatientId, schedule.UserOrgId)
+		if order.ID > 0 {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSchedule)
+			return
+		}
 		//调换位置
 		sch := models.Schedule{
 			PatientId: schedule.PatientId,

controllers/patient_api_controller.go

@@ -581,6 +581,7 @@ func (c *PatientApiController) EditPatient() {
 		Lapseto:                   patient.Lapseto,
 		TrobleShoot:               patient.TrobleShoot,
 		SchRemark:                 patient.SchRemark,
+		TreatmentPlan:             patient.TreatmentPlan,
 	}
 	//	//更新病人ID获取新表病人ID
 	err = service.UpdatepatientTwo(&patientsNew, id)
@@ -917,6 +918,7 @@ func (c *PatientApiController) UpdateDialysisSolution() {
 			OxygenFlow:                 solution.OxygenFlow,
 			OxygenTime:                 solution.OxygenTime,
 			MaxUltrafiltrationRate:     solution.MaxUltrafiltrationRate,
+			Amylaceum:                  solution.Amylaceum,
 		}
 		service.UpdatePatientDialysisSolutionOne(solution.PatientId, adminUserInfo.CurrentOrgId, &prescription, todayTime.Unix())
 	}
@@ -3841,6 +3843,11 @@ func defaultSolutionFormData(solution *models.DialysisSolution, data []byte, met
 		max_ultrafiltration_rate, _ := strconv.ParseFloat(dataBody["max_ultrafiltration_rate"].(string), 64)
 		solution.MaxUltrafiltrationRate = max_ultrafiltration_rate
 	}
+
+	if dataBody["amylaceum"] != nil && reflect.TypeOf(dataBody["amylaceum"]).String() == "string" {
+		amylaceum := dataBody["amylaceum"].(string)
+		solution.Amylaceum = amylaceum
+	}
 	return
 }
 
@@ -5199,7 +5206,6 @@ func (c *PatientApiController) GetPatientDialysisLongSolution() {
 	for _, item := range list {
 		//获取该模式最新的1条数据
 		solution, _ := service.GetNewPatientSolutionByModeId(patient_id, item.ModeId, adminUserInfo.CurrentOrgId)
-
 		//更新状态值
 		service.UpdateDialysisSolutionStatus(solution.ID, item.ModeId, adminUserInfo.CurrentOrgId, patient_id)
 	}

controllers/stock_in_api_controller.go

@@ -149,8 +149,104 @@ func StockManagerApiRegistRouters() {
 	beego.Router("/api/stock/getprintlist", &StockManagerApiController{}, "Get:GetPrintList")
 
 	beego.Router("/api/stock/getwarehouseinfolist", &StockManagerApiController{}, "Get:GetInvetoryWarehouseInfoList")
+
+	//结算成功后调用操作库存相关接口
+	beego.Router("/api/settle/stock", &StockManagerApiController{}, "Get:HandleSettleStock")
+	beego.Router("/api/settle/cancelstock", &StockManagerApiController{}, "Get:HandleRefundStock")
 }
 
+func (c *StockManagerApiController) HandleRefundStock() {
+	order_id, _ := c.GetInt64("order_id", 0)
+	order, _ := service.GetHisOrderByIDThree(order_id)
+	if order.ID == 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	orders, _ := service.GetHisOrderDetailByNumberThree(order.Number, order.UserOrgId)
+	houseConfig, _ := service.GetAllStoreHouseConfig(order.UserOrgId)
+	var goods []*models.DialysisBeforePrepareGoods
+	var newGoods []*models.NewDialysisBeforePrepareGoods
+	var infos []*models.HisDoctorAdviceInfo
+
+	for _, info := range orders {
+		if info.AdviceId > 0 && info.ProjectId == 0 {
+			infos = append(infos, &info.HisDoctorAdviceInfo)
+		}
+		if info.ProjectId > 0 && info.AdviceId == 0 {
+			if info.HisPrescriptionProject.Type == 3 {
+				var good models.DialysisBeforePrepareGoods
+				var newGood models.NewDialysisBeforePrepareGoods
+				good.GoodId = info.HisPrescriptionProject.VMGoodInfo.ID
+				good.GoodTypeId = info.HisPrescriptionProject.VMGoodInfo.GoodTypeId
+				count, _ := strconv.Atoi(info.HisPrescriptionProject.Count)
+				good.Count = int64(count)
+				good.StorehouseId = houseConfig.StorehouseOutInfo
+				good.ProjectId = info.HisPrescriptionProject.ID
+				goods = append(goods, &good)
+
+				newGood.GoodId = info.HisPrescriptionProject.VMGoodInfo.ID
+				newGood.GoodTypeId = info.HisPrescriptionProject.VMGoodInfo.GoodTypeId
+				count2, _ := strconv.Atoi(info.HisPrescriptionProject.Count)
+				newGood.Count = int64(count2)
+				newGood.StorehouseId = houseConfig.StorehouseOutInfo
+				newGood.ProjectId = info.HisPrescriptionProject.ID
+				newGoods = append(newGoods, &newGood)
+			}
+		}
+	}
+	for _, item := range infos {
+		//service.HisDrugsDelivery(item.UserOrgId, order.Creator, item)
+		service.DrugAutoAddCancelInfo(item, order.Creator)
+
+	}
+
+}
+func (c *StockManagerApiController) HandleSettleStock() {
+
+	order_id, _ := c.GetInt64("order_id", 0)
+	order, _ := service.GetHisOrderByID(order_id)
+	if order.ID == 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	orders, _ := service.GetHisOrderDetailByNumberTwo(order.Number, order.UserOrgId)
+	houseConfig, _ := service.GetAllStoreHouseConfig(order.UserOrgId)
+	var goods []*models.DialysisBeforePrepareGoods
+	var newGoods []*models.NewDialysisBeforePrepareGoods
+	var infos []*models.HisDoctorAdviceInfo
+
+	for _, info := range orders {
+		if info.AdviceId > 0 && info.ProjectId == 0 {
+			infos = append(infos, &info.HisDoctorAdviceInfo)
+		}
+		if info.ProjectId > 0 && info.AdviceId == 0 {
+			if info.HisPrescriptionProject.Type == 3 {
+				var good models.DialysisBeforePrepareGoods
+				var newGood models.NewDialysisBeforePrepareGoods
+				good.GoodId = info.HisPrescriptionProject.VMGoodInfo.ID
+				good.GoodTypeId = info.HisPrescriptionProject.VMGoodInfo.GoodTypeId
+				count, _ := strconv.Atoi(info.HisPrescriptionProject.Count)
+				good.Count = int64(count)
+				good.StorehouseId = houseConfig.StorehouseOutInfo
+				good.ProjectId = info.HisPrescriptionProject.ID
+				goods = append(goods, &good)
+
+				newGood.GoodId = info.HisPrescriptionProject.VMGoodInfo.ID
+				newGood.GoodTypeId = info.HisPrescriptionProject.VMGoodInfo.GoodTypeId
+				count2, _ := strconv.Atoi(info.HisPrescriptionProject.Count)
+				newGood.Count = int64(count2)
+				newGood.StorehouseId = houseConfig.StorehouseOutInfo
+				newGood.ProjectId = info.HisPrescriptionProject.ID
+				newGoods = append(newGoods, &newGood)
+			}
+		}
+	}
+	service.ConsumablesDeliveryTotal(order.UserOrgId, order.PatientId, order.SettleAccountsDate, goods, newGoods, order.Creator)
+	for _, item := range infos {
+		service.HisDrugsDelivery(item.UserOrgId, order.Creator, item)
+	}
+}
 func (c *StockManagerApiController) CreateWarehouse() {
 
 	warehousing_time := c.GetString("warehousing_time")

enums/error_code.go

@@ -514,7 +514,7 @@ var ErrCodeMsgs = map[int]string{
 	ErrorCodeDeletePChargeWrongTwo: "该医嘱所属处方已经收费或已经上传的处方,无法删除",
 
 	ErrorCodeHisPatientNoRegException: "该患者尚未挂号，请先挂号",
-	ErrorCodeSchedule:                 "该班次该床位已有患者",
+	ErrorCodeSchedule:                 "被调用床位已有患者上机",
 }
 
 type SGJError struct {

models/device_models.go

@@ -1174,3 +1174,18 @@ func (XtScheduleSix) TableName() string {
 
 	return "xt_schedule"
 }
+
+type XtScheduleSeven 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"`
+	ScheduleDate int64 `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
+	ScheduleType int64 `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
+	Status       int64 `gorm:"column:status" json:"status" form:"status"`
+	Count        int64
+}
+
+func (XtScheduleSeven) TableName() string {
+
+	return "xt_schedule"
+}

models/dialysis.go

@@ -1103,6 +1103,8 @@ type NewDialysisBeforePrepareGoods struct {
 	NewCount          int64  `gorm:"column:new_count" json:"new_count" form:"new_count"`
 	ProjectId         int64  `gorm:"column:project_id" json:"project_id" form:"project_id"`
 	StorehouseId      int64  `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	RecordDate        int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	UserOrgId         int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
 }
 
 type QueueCallConfig struct {

models/drug.go

@@ -225,6 +225,9 @@ type BaseDrugLibTwenty struct {
 	MaxUnit        string `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
 	MinNumber      int64  `gorm:"column:min_number" json:"min_number" form:"min_number"`
 	MinUnit        string `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	Dose           string `gorm:"column:dose" json:"dose" form:"dose"`
+	DoseUnit       string `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
+	DrugStatus     string `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
 	DrugStockLimit string `gorm:"column:drug_stock_limit" json:"drug_stock_limit_count" form:"drug_stock_limit"`
 }
 

models/new_monitor.go

@@ -110,6 +110,7 @@ type VMMonitoringRecord struct {
 	SystolicBloodPressure  float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure"`
 	DiastolicBloodPressure float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure"`
 	Status                 int64   `gorm:"column:status" json:"status"`
+	AccumulatedBloodVolume float64 `gorm:"column:accumulated_blood_volume" json:"accumulated_blood_volume" form:"accumulated_blood_volume"`
 }
 
 func (VMMonitoringRecord) TableName() string {

models/schedule_models.go

@@ -366,13 +366,36 @@ type VmBloodScheduleTwo struct {
 	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"`
-	HisPrescriptionTemplateSix HisPrescriptionTemplateSix `gorm:"ForeignKey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId" json:"his_prescription_template"`
+	HisPrescriptionTemplateSix HisPrescriptionTemplateSix `gorm:"ForeignKey:PatientId,Mode;AssociationForeignKey:PatientId,ModeId" json:"his_prescription_template"`
 }
 
 func (VmBloodScheduleTwo) TableName() string {
 	return "xt_schedule"
 }
 
+type VmBloodScheduleThree 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"`
+	HisPrescriptionTemplateSix HisPrescriptionTemplateSix `gorm:"ForeignKey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId" json:"his_prescription_template"`
+}
+
+func (VmBloodScheduleThree) TableName() string {
+	return "xt_schedule"
+}
+
 type HisPrescriptionTemplateSix 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"`
@@ -404,6 +427,7 @@ type HisPrescriptionInfoTemplateSix struct {
 	PType                               int64                                  `gorm:"column:p_type" json:"p_type" form:"p_type"`
 	PTemplateId                         int64                                  `gorm:"column:p_template_id" json:"p_template_id" form:"p_template_id"`
 	HisPrescriptionProjectTemplateSeven []*HisPrescriptionProjectTemplateSeven `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"project"`
+	HisPrescriptionAdviceTemplate       []*HisPrescriptionAdviceTemplate       `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"his_advice"`
 	MedType                             string                                 `gorm:"column:med_type" json:"med_type" form:"med_type"`
 }
 

service/dialysis_service.go

@@ -1862,3 +1862,26 @@ func GetDialysisRecordOrder(org_id int64, patient_id int64, dialysis_date int64)
 	err := XTReadDB().Where("user_org_id = ? and patient_id = ? and dialysis_date = ? and status =1 ", org_id, patient_id, dialysis_date).Find(&order).Error
 	return order, err
 }
+
+func GetSolutionListByOrgId(orgid int64) (list []*models.DialysisSolution, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and status = 1", orgid).Group("patient_id,mode_id").Order("id desc").Find(&list).Error
+
+	return list, err
+}
+
+func GetScheduleTypeById(org_id int64, schedule_date int64, schedule_type int64) (list []*models.XtScheduleSeven, err error) {
+
+	db := XTReadDB().Model(&list).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)
+	}
+	if schedule_type > 0 {
+		db = db.Where("schedule_type = ?", schedule_type)
+	}
+	err = db.Select("partition_id,count(id) as count").Group("partition_id").Scan(&list).Error
+	return list, err
+}

service/dialysis_solution_service.go

@@ -41,8 +41,8 @@ func GetLastPatientDialysisSolution(patient_id int64, orgid int64) (models.Dialy
 	return solution, err
 }
 
-func GetPatientDialysisSolutionGroupList(keywords string, limit int64, page int64, partition_id int64, schedule_type int64, scheduleDate int64, orgID int64) (schedule []*models.VmBloodSchedule, total int64, err error) {
-
+func GetPatientDialysisSolutionGroupList(keywords string, limit int64, page int64, partition_id int64, schedule_type int64, scheduleDate int64, orgID int64, ids []string) (schedule []*models.VmBloodSchedule, total int64, err error) {
+	fmt.Println("ids23322332323232wode", len(ids))
 	db := XTReadDB().Model(&models.VmBloodSchedule{}).Where("xt_schedule.status = 1")
 	offset := (page - 1) * limit
 	if scheduleDate > 0 {
@@ -57,6 +57,9 @@ func GetPatientDialysisSolutionGroupList(keywords string, limit int64, page int6
 	if orgID > 0 {
 		db = db.Where("xt_schedule.user_org_id  = ?", orgID)
 	}
+	if len(ids) >= 1 {
+		db = db.Where("xt_schedule.id in(?)", ids)
+	}
 
 	if len(keywords) > 0 {
 		keywords = "%" + keywords + "%"
@@ -67,10 +70,10 @@ func GetPatientDialysisSolutionGroupList(keywords string, limit int64, page int6
 		db = db.Joins("JOIN xt_patients AS patient ON patient.id=xt_schedule.patient_id AND patient.status = 1 AND patient.user_org_id = ? AND patient.name Like ?", orgID, keywords)
 		err = db.Count(&total).Offset(offset).Limit(limit).Find(&schedule).Error
 	} else {
-		err = db.Count(&total).Offset(offset).Limit(limit).Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+		err = db.Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
 			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
 			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
-			Preload("DialysisSolution", "status = 1 AND user_org_id = ? and solution_status = 1", orgID).Find(&schedule).Error
+			Preload("DialysisSolution", "status = 1 AND user_org_id = ? and solution_status = 1", orgID).Count(&total).Offset(offset).Limit(limit).Find(&schedule).Error
 	}
 
 	return schedule, total, err
@@ -92,7 +95,7 @@ func GetDialysisAdviceTemplateList(keywords string, limit int64, page int64, par
 		db = db.Where("xt_schedule.user_org_id  = ?", orgID)
 	}
 	fmt.Println("idArray23233223323232233232", len(idArray))
-	if len(idArray) > 1 {
+	if len(idArray) >= 1 {
 		db = db.Where("xt_schedule.id in(?)", idArray)
 	}
 
@@ -113,7 +116,7 @@ func GetDialysisAdviceTemplateList(keywords string, limit int64, page int64, par
 
 func GetAllLongAdviceList(user_org_id int64) (advice []*models.DoctorAdvice, err error) {
 
-	err = XTReadDB().Where("user_org_id = ? and advice_type = 1 and status = 1", user_org_id).Find(&advice).Error
+	err = XTReadDB().Where("user_org_id = ? and advice_type = 1 and status = 1 and stop_state!=1", user_org_id).Find(&advice).Error
 	return advice, err
 }
 
@@ -136,7 +139,7 @@ func GetDialysisSetting(orgid int64) (models.XtDialysisSetting, error) {
 	return setting, err
 }
 
-func GetDialysisParameterList(keywords string, limit int64, page int64, partition_id int64, schedule_type int64, scheduleDate int64, orgID int64) (schedule []*models.VmBloodSchedule, total int64, err error) {
+func GetDialysisParameterList(keywords string, limit int64, page int64, partition_id int64, schedule_type int64, scheduleDate int64, orgID int64, ids []string) (schedule []*models.VmBloodSchedule, total int64, err error) {
 	db := XTReadDB().Model(&models.VmBloodSchedule{}).Where("xt_schedule.status = 1")
 	offset := (page - 1) * limit
 	if scheduleDate > 0 {
@@ -151,13 +154,16 @@ func GetDialysisParameterList(keywords string, limit int64, page int64, partitio
 	if orgID > 0 {
 		db = db.Where("xt_schedule.user_org_id  = ?", orgID)
 	}
+	if len(ids) >= 1 {
+		db = db.Where("xt_schedule.id in(?)", ids)
+	}
 
 	if len(keywords) > 0 {
 		keywords = "%" + keywords + "%"
 		db = db.Joins("JOIN xt_patients AS patient ON patient.id=xt_schedule.patient_id AND patient.status = 1 AND patient.user_org_id = ? AND patient.name Like ?", orgID, keywords)
 		err = db.Count(&total).Offset(offset).Limit(limit).Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
 			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
-			Preload("DialysisSolution", "status = 1 AND user_org_id = ?", orgID).
+			Preload("DialysisSolution", "status = 1 AND user_org_id = ? and solution_status = 1", orgID).
 			Preload("DialysisPrescription", "status = 1 AND user_org_id = ? and record_date = ?", orgID, scheduleDate).
 			Preload("XtAssessmentBeforeDislysis", "status = 1 AND user_org_id = ? and assessment_date = ?", orgID, scheduleDate).
 			Preload("ReceiveTreatmentAsses", "status = 1 AND user_org_id = ? and record_date = ?", orgID, scheduleDate).
@@ -170,7 +176,7 @@ func GetDialysisParameterList(keywords string, limit int64, page int64, partitio
 	} else {
 		err = db.Count(&total).Offset(offset).Limit(limit).Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
 			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
-			Preload("DialysisSolution", "status = 1 AND user_org_id = ?", orgID).
+			Preload("DialysisSolution", "status = 1 AND user_org_id = ? and solution_status = 1", orgID).
 			Preload("DialysisPrescription", "status = 1 AND user_org_id = ? and record_date = ?", orgID, scheduleDate).
 			Preload("XtAssessmentBeforeDislysis", "status = 1 AND user_org_id = ? and assessment_date = ?", orgID, scheduleDate).
 			Preload("ReceiveTreatmentAsses", "status = 1 AND user_org_id = ? and record_date = ?", orgID, scheduleDate).
@@ -236,6 +242,85 @@ func GetDialysisAdviceSchedulist(orgID int64, schedule_type int64, partition_id
 
 }
 
+func GetDialysisAdviceSchedulistTwo(orgID int64, schedule_type int64, partition_id int64, scheduleDate int64) (schedule []*models.VmBloodScheduleTwo, err error) {
+
+	db := XTReadDB().Model(&models.VmBloodScheduleTwo{}).Where("status = 1")
+
+	if scheduleDate > 0 {
+		db = db.Where("schedule_date = ?", scheduleDate)
+	}
+	if schedule_type > 0 {
+		db = db.Where("schedule_type = ?", schedule_type)
+	}
+	if partition_id > 0 {
+		db = db.Where("partition_id = ?", 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("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+		Preload("HisPrescriptionTemplateSix", func(db *gorm.DB) *gorm.DB {
+			return db.Where("user_org_id = ? and status = 1", orgID).Preload("HisPrescriptionInfoTemplateSix", func(db *gorm.DB) *gorm.DB {
+				return db.Where("user_org_id = ? and status = 1 and type = 1", orgID).Preload("HisPrescriptionAdviceTemplate", func(db *gorm.DB) *gorm.DB {
+					return db.Where("user_org_id = ? and status = 1", orgID).Preload("Drug", "org_id =? and status = 1", orgID)
+				})
+			})
+		}).Find(&schedule).Error
+
+	return schedule, err
+
+}
+
+func GetDialysisAdviceSchedulistSix(keywords string, limit int64, page int64, partition_id int64, schedule_type int64, scheduleDate int64, orgID int64, idArray []string) (schedule []*models.VmBloodScheduleTwo, total int64, err error) {
+	db := XTReadDB().Model(&models.VmBloodScheduleTwo{}).Where("xt_schedule.status = 1")
+	offset := (page - 1) * limit
+	if scheduleDate > 0 {
+		db = db.Where("xt_schedule.schedule_date = ?", scheduleDate)
+	}
+	if schedule_type > 0 {
+		db = db.Where("xt_schedule.schedule_type = ?", schedule_type)
+	}
+	if partition_id > 0 {
+		db = db.Where("xt_schedule.partition_id = ?", partition_id)
+	}
+	if orgID > 0 {
+		db = db.Where("xt_schedule.user_org_id  = ?", orgID)
+	}
+	if len(idArray) >= 1 {
+		db = db.Where("xt_schedule.id in(?)", idArray)
+	}
+
+	if len(keywords) > 0 {
+		keywords = "%" + keywords + "%"
+		db = db.Joins("JOIN xt_patients AS patient ON patient.id=xt_schedule.patient_id AND patient.status = 1 AND patient.user_org_id = ? AND patient.name Like ?", orgID, keywords)
+		err = db.Count(&total).Offset(offset).Limit(limit).Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+			Preload("HisPrescriptionTemplateSix", func(db *gorm.DB) *gorm.DB {
+				return db.Where("user_org_id = ? and status = 1", orgID).Preload("HisPrescriptionInfoTemplateSix", func(db *gorm.DB) *gorm.DB {
+					return db.Where("user_org_id = ? and status = 1 and type = 1", orgID).Preload("HisPrescriptionAdviceTemplate", func(db *gorm.DB) *gorm.DB {
+						return db.Where("user_org_id = ? and status = 1", orgID).Preload("Drug", "org_id =? and status = 1", orgID)
+					})
+				})
+			}).Find(&schedule).Error
+	} else {
+		err = db.Count(&total).Offset(offset).Limit(limit).Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+			Preload("HisPrescriptionTemplateSix", func(db *gorm.DB) *gorm.DB {
+				return db.Where("user_org_id = ? and status = 1", orgID).Preload("HisPrescriptionInfoTemplateSix", func(db *gorm.DB) *gorm.DB {
+					return db.Where("user_org_id = ? and status = 1 and type = 1", orgID).Preload("HisPrescriptionAdviceTemplate", func(db *gorm.DB) *gorm.DB {
+						return db.Where("user_org_id = ? and status = 1", orgID).Preload("Drug", "org_id =? and status = 1", orgID)
+					})
+				})
+			}).Find(&schedule).Error
+	}
+
+	return schedule, total, err
+}
+
 func GetAllDrugMap(org_id int64) (list []*BaseDrugLib, err error) {
 
 	err = readDb.Model(&BaseDrugLib{}).Where("org_id = ?  AND status = 1", org_id).Find(&list).Error
@@ -259,6 +344,7 @@ func GetDialysisParameterGoodList(orgID int64, schedule_type int64, partition_id
 		db = db.Where("user_org_id  = ?", orgID)
 	}
 	err = db.Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+		Preload("DialysisSolution", "status=1 and user_org_id = ? and solution_status = 1", orgID).
 		Preload("DialysisPrescription", "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_date = ?", orgID, scheduleDate).
@@ -277,8 +363,8 @@ func SaveHisDialysis(orgid int64, ids []string) error {
 	return err
 }
 
-func GetHisPatientDialysisSolutionGroupList(keywords string, limit int64, page int64, partition_id int64, schedule_type int64, scheduleDate int64, orgID int64) (schedule []*models.VmBloodScheduleTwo, total int64, err error) {
-
+func GetHisPatientDialysisSolutionGroupList(keywords string, limit int64, page int64, partition_id int64, schedule_type int64, scheduleDate int64, orgID int64, ids []string) (schedule []*models.VmBloodScheduleTwo, total int64, err error) {
+	fmt.Println("ids23322332323232hhha", ids)
 	db := XTReadDB().Model(&models.VmBloodScheduleTwo{}).Where("xt_schedule.status = 1")
 	offset := (page - 1) * limit
 	if scheduleDate > 0 {
@@ -293,6 +379,9 @@ func GetHisPatientDialysisSolutionGroupList(keywords string, limit int64, page i
 	if orgID > 0 {
 		db = db.Where("xt_schedule.user_org_id  = ?", orgID)
 	}
+	if len(ids) >= 1 {
+		db = db.Where("xt_schedule.id in(?)", ids)
+	}
 
 	if len(keywords) > 0 {
 		keywords = "%" + keywords + "%"

service/gobal_config_service.go

@@ -990,3 +990,9 @@ func GetDrugWarehouseOutInfoFlow(drug_id int64, start_time int64, end_time int64
 	err = db.Find(&info).Error
 	return info, err
 }
+
+func GetAllBaseDrugListTwenty(orgid int64) (drug []*models.BaseDrugLibTwenty, err error) {
+
+	err = XTReadDB().Model(&drug).Where("org_id = ? and status = 1 AND  find_in_set('停用',drug_status) = 0", orgid).Find(&drug).Error
+	return drug, err
+}

service/his_service.go

@@ -2540,3 +2540,51 @@ func GetHisPrescriptonProjectById(id int64) (models.HisPrescriptionProject, erro
 	err := XTReadDB().Where("id = ? and status = 1", id).Find(&project).Error
 	return project, err
 }
+
+type HisOrderInfoTwo struct {
+	ID                     int64                      `gorm:"column:id" json:"id" form:"id"`
+	OrderNumber            string                     `gorm:"column:order_number" json:"order_number" form:"order_number"`
+	UploadDate             int64                      `gorm:"column:upload_date" json:"upload_date" form:"upload_date"`
+	AdviceId               int64                      `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
+	DetItemFeeSumamt       float64                    `gorm:"column:det_item_fee_sumamt" json:"det_item_fee_sumamt" form:"det_item_fee_sumamt"`
+	Cnt                    float64                    `gorm:"column:cnt" json:"cnt" form:"cnt"`
+	Pric                   float64                    `gorm:"column:pric" json:"pric" form:"pric"`
+	PatientId              int64                      `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	MedChrgitmType         string                     `gorm:"column:med_chrgitm_type" json:"med_chrgitm_type" form:"med_chrgitm_type"`
+	Status                 int64                      `gorm:"column:status" json:"status" form:"status"`
+	FeedetlSn              string                     `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	ChldMedcFlag           string                     `gorm:"column:chld_medc_flag" json:"chld_medc_flag" form:"chld_medc_flag"`
+	ChrgitmLv              string                     `gorm:"column:chrgitm_lv" json:"chrgitm_lv" form:"chrgitm_lv"`
+	UserOrgId              int64                      `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	ProjectId              int64                      `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	ItemId                 int64                      `gorm:"column:item_id" json:"item_id" form:"item_id"`
+	FulamtOwnpayAmt        float64                    `gorm:"column:fulamt_ownpay_amt" json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
+	HisPrescriptionProject HisPrescriptionProject     `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"project"`
+	HisDoctorAdviceInfo    models.HisDoctorAdviceInfo `gorm:"ForeignKey:ID;AssociationForeignKey:AdviceId" json:"advice"`
+}
+
+func (HisOrderInfoTwo) TableName() string {
+	return "his_order_info"
+}
+func GetHisOrderDetailByNumberTwo(order_number string, org_id int64) (order []*HisOrderInfoTwo, err error) {
+	err = readDb.Model(&HisOrderInfoTwo{}).Where("order_number = ? AND status = 1", order_number).Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("VMHisProject", "status = 1 AND user_org_id = ?", org_id).Preload("VMGoodInfo", "status = 1 AND org_id = ?", org_id)
+	}).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("Drug", "status = 1 AND org_id = ?", org_id)
+	}).Find(&order).Error
+	return
+}
+
+func GetHisOrderDetailByNumberThree(order_number string, org_id int64) (order []*HisOrderInfoTwo, err error) {
+	err = readDb.Model(&HisOrderInfoTwo{}).Where("order_number = ?", order_number).Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("VMHisProject", "status = 1 AND user_org_id = ?", org_id).Preload("VMGoodInfo", "status = 1 AND org_id = ?", org_id)
+	}).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("Drug", "status = 1 AND org_id = ?", org_id)
+	}).Find(&order).Error
+	return
+}
+
+func GetHisOrderByIDThree(order_id int64) (order models.HisOrder, err error) {
+	err = readDb.Model(&models.HisOrder{}).Where("id = ?", order_id).First(&order).Error
+	return
+}

service/his_summary_service.go

@@ -9,7 +9,7 @@ import (
 func GetHisSummaryDetailList(keyword string, item_type int64, patient_id int64, org_id int64, start_time int64, end_time int64) (patients []*models.ChargePatient, err error) {
 
 	err = XTReadDB().Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2 and orders.patient_id = ?", start_time, end_time, org_id, patient_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
-		return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id,psn_cash_pay,acct_pay,fund_pay_sumamt,is_medicine_insurance,medfee_sumamt").
+		return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id,psn_cash_pay,acct_pay,fund_pay_sumamt,is_medicine_insurance,medfee_sumamt,maf_pay,hifes_pay").
 			Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
 				return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Where("status = 1").
 					Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {

service/manage_center_service.go

@@ -867,3 +867,122 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 	}
 	return err
 }
+
+func GoodAutoAddCancelInfo(good *models.NewDialysisBeforePrepareGoods, creater int64) error {
+
+	//查询已经出库数量
+	info, _ := GetWareOutInfo(good.GoodId, good.RecordDate, good.UserOrgId)
+	if len(info) > 0 {
+		houseConfig, _ := GetAllStoreHouseConfig(good.UserOrgId)
+
+		operation_time := time.Now().Unix()
+		//创建退库单
+		timeStr := time.Now().Format("2006-01-02")
+		timeArr := strings.Split(timeStr, "-")
+		total, _ := FindAllCancelStockTotal(good.UserOrgId)
+		total = total + 1
+		orderNumber := "CKTKD" + strconv.FormatInt(good.UserOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
+
+		cancelStock := models.CancelStock{
+			OrderNumber:  orderNumber,
+			OperaTime:    operation_time,
+			OrgId:        good.UserOrgId,
+			Creater:      creater,
+			Ctime:        time.Now().Unix(),
+			Status:       1,
+			ReturnTime:   good.RecordDate,
+			Type:         1,
+			StorehouseId: houseConfig.StorehouseOutInfo,
+			IsCheck:      1,
+		}
+		_, msgerrkonde := GetCancelStockDetailByOrderNumberOne(good.RecordDate, good.UserOrgId)
+		if msgerrkonde == gorm.ErrRecordNotFound {
+			AddSigleCancelStock(&cancelStock)
+		}
+		cancel, _ := GetLastCancelStockById(good.UserOrgId)
+		for _, item := range info {
+			manufacturer, _ := GetManufactureById(item.Manufacturer)
+			deaerler, _ := GetDealerById(item.Dealer)
+
+			cancelStockInfo := models.CancelStockInfo{
+				GoodId:          good.GoodId,
+				CancelStockId:   cancel.ID,
+				GoodTypeId:      good.GoodTypeId,
+				Count:           item.Count,
+				Price:           item.Price,
+				Total:           0,
+				ProductDate:     item.ProductDate,
+				ExpiryDate:      item.ExpiryDate,
+				Ctime:           time.Now().Unix(),
+				Status:          1,
+				OrgId:           good.UserOrgId,
+				OrderNumber:     cancel.OrderNumber,
+				Type:            0,
+				Dealer:          deaerler.DealerName,
+				Manufacturer:    manufacturer.ManufacturerName,
+				Number:          item.Number,
+				RegisterAccount: "",
+				Remark:          "",
+				WarehouseInfoId: item.WarehouseInfotId,
+				PatientId:       item.PatientId,
+				RecordDate:      item.SysRecordTime,
+				StorehouseId:    houseConfig.StorehouseOutInfo,
+				IsCheck:         1,
+			}
+
+			CreateCancelStockInfoOne(&cancelStockInfo)
+			cancelInfo, _ := GetLastCancelStockInfoByGoodId(good.GoodId)
+			goodList, _ := GetSumGoodList(item.OrgId, houseConfig.StorehouseOutInfo, item.GoodId)
+			var over_count int64
+			for _, it := range goodList {
+				over_count += it.StockCount
+			}
+			flow := models.VmStockFlow{
+				WarehousingId:           item.WarehouseInfotId,
+				GoodId:                  item.GoodId,
+				Number:                  item.Number,
+				LicenseNumber:           item.LicenseNumber,
+				Count:                   item.Count,
+				UserOrgId:               item.OrgId,
+				PatientId:               item.PatientId,
+				SystemTime:              item.SysRecordTime,
+				ConsumableType:          7,
+				IsSys:                   0,
+				WarehousingOrder:        "",
+				WarehouseOutId:          item.WarehouseOutId,
+				WarehouseOutOrderNumber: item.WarehouseOutOrderNumber,
+				IsEdit:                  0,
+				CancelStockId:           cancel.ID,
+				CancelOrderNumber:       cancel.OrderNumber,
+				Manufacturer:            manufacturer.ID,
+				Dealer:                  0,
+				Creator:                 creater,
+				UpdateCreator:           0,
+				Status:                  1,
+				Ctime:                   time.Now().Unix(),
+				Mtime:                   0,
+				Price:                   item.Price,
+				WarehousingDetailId:     item.WarehouseInfotId,
+				WarehouseOutDetailId:    item.ID,
+				CancelOutDetailId:       cancelInfo.ID,
+				ProductDate:             item.ProductDate,
+				ExpireDate:              item.ExpiryDate,
+				StorehouseId:            houseConfig.StorehouseOutInfo,
+				OverCount:               over_count,
+			}
+			CreateStockFlowOne(flow)
+
+			//回退库存
+			UpDateWarehouseInfoByStockDelete(item.WarehouseInfotId, item.Count, item.PatientId, item.SysRecordTime, item.GoodId)
+			//退库数量增加
+			UpdateSumAddCancelCount(good.UserOrgId, good.GoodId, houseConfig.StorehouseOutInfo, good.Count)
+			//出库数量减少
+			UpdateSumCount(good.UserOrgId, houseConfig.StorehouseOutInfo, good.GoodId, good.Count)
+			//删除出库表
+			DeleteAutoRedeceDetailTen(good.UserOrgId, item.PatientId, item.SysRecordTime, item.GoodId)
+			//更新剩余库存
+			UpdateSumGood(good.UserOrgId, houseConfig.StorehouseOutInfo, item.GoodId, over_count)
+		}
+	}
+	return err
+}

service/mobile_dialysis_service.go

@@ -37,7 +37,7 @@ func MobileGetDialysisScheduals(orgID int64, scheduleDate int64, scheduleType in
 		db = db.Where("schedule_type = ?", scheduleType)
 	}
 
-	err := db.Find(&vms).Error
+	err := db.Preload("DialysisSolution", "status = 1 and user_org_id = ? and solution_status = 1", orgID).Find(&vms).Error
 	return vms, err
 }
 
@@ -135,6 +135,7 @@ type MDialysisScheduleVMForList struct {
 	HisAdvices               []VMHisDoctorAdviceInfo           `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"his_doctor_advice"`
 	Advices                  []models.VMDoctorAdviceForList    `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"doctor_advice"`
 	TreatmentSummary         *models.VMTreatmentSummaryForList `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"treatment_summary"`
+	DialysisSolution         *models.DialysisSolution          `gorm:"ForeignKey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId" json:"dialysis_solution"`
 }
 
 func (MDialysisScheduleVMForList) TableName() string {

service/new_stock_service.go

@@ -359,3 +359,9 @@ func UpdateLastAutoCount(id int64, count int64) error {
 	err := XTWriteDB().Model(&detail).Where("id = ?", id).Update(map[string]interface{}{"count": count, "status": 1}).Error
 	return err
 }
+
+func GetWareOutInfo(good_id int64, record_date int64, user_org_id int64) (outinfo []*models.WarehouseOutInfo, err error) {
+
+	err = XTReadDB().Where("good_id = ? and sys_record_time = ? and org_id = ? and status = 1", good_id, record_date, user_org_id).Find(&outinfo).Error
+	return outinfo, err
+}

service/new_warehouse_service.go

@@ -1838,6 +1838,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 				OverCount:               sum_count,
 				AdviceId:                advice.ID,
 				LastPrice:               warehouse.Price,
+				SystemTime:              advice.AdviceDate,
 			}
 
 			CreateDrugFlowOne(drugflow)

service/patient_service.go

@@ -830,7 +830,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}).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}).Error
 	return err
 }
 
@@ -2459,7 +2459,7 @@ func GetAllMonitorList(orgID int64, scheduleDate int64) (monitor []*models.VMMon
 	monitor_record_list_all, _ := redis.Get(key).Result()
 	fmt.Println("monitor_recorde_list", len(monitor_record_list_all))
 	if len(monitor_record_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Model(&models.VMMonitoringRecord{}).Where("status = 1  AND user_org_id = ? AND  monitoring_date= ?", orgID, scheduleDate).Find(&monitor).Error
+		err = readDb.Model(&models.VMMonitoringRecord{}).Where("status = 1  AND user_org_id = ? AND  monitoring_date= ?", orgID, scheduleDate).Order("monitoring_date asc").Find(&monitor).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
 				return nil, nil
@@ -2645,6 +2645,19 @@ func GetAllHisProjectPrescription(orgid int64, recorddate int64) (project []*mod
 	return project, err
 }
 
+func GetZoneCountList(orgid int64, schedule_date int64) (list []*models.XtScheduleSeven, err error) {
+
+	db := XTReadDB().Model(&list).Where("status = 1")
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+	if schedule_date > 0 {
+		db = db.Where("schedule_date =?", schedule_date)
+	}
+	err = db.Select("partition_id,count(id) as count").Group("partition_id").Scan(&list).Error
+	return list, err
+}
+
 func GetPatientDialysisLongSolution(patient_id int64, page int64, limit int64, orgid int64) (solution []*models.DialysisSolution, total int64, err error) {
 
 	db := XTReadDB().Model(&solution).Where("status = 1 and solution_status = 1")

service/schedule_service.go

@@ -1199,3 +1199,9 @@ func GetLastWeightAfter(patient_id int64, scheduleDate int64, orgid int64) (mode
 	err := XTReadDB().Where("user_org_id = ? and  patient_id = ? and assessment_date < ? and status = 1", orgid, patient_id, scheduleDate).Order("id desc").First(&dislysis).Error
 	return dislysis, err
 }
+
+func ChangeScheduleClass(schedule models.Schedule) error {
+
+	err := XTWriteDB().Model(&schedule).Where("patient_id = ? and schedule_date = ? and user_org_id = ? and status = 1", schedule.PatientId, schedule.ScheduleDate, schedule.UserOrgId).Update(map[string]interface{}{"schedule_type": schedule.ScheduleType}).Error
+	return err
+}