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

controllers/dialysis_api_controller.go

@@ -97,6 +97,16 @@ 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")
+
+	beego.Router("/api/schedule/excutiondoctoradvice", &DialysisApiController{}, "Get:ExcutionDoctorAdvice")
+
+	beego.Router("/api/schedule/checknewdoctoradvice", &DialysisApiController{}, "Get:CheckNewDoctorAdvice")
+
+	beego.Router("/api/schedule/settlenewdoctoradvice", &DialysisApiController{}, "Get:SettleNewDoctorAdvice")
+
+	beego.Router("/api/schedule/excutiondoctoradvicebyid", &DialysisApiController{}, "Get:ExcutionDoctorAdviceById")
 }
 
 func (c *DialysisApiController) GetQueueCall() {
@@ -309,6 +319,8 @@ func (c *DialysisApiController) PostPrescription() {
 	drhy_water := c.GetString("drhy_water")
 	dry_water_hour := c.GetString("dry_water_hour")
 	water_machine := c.GetString("water_machine")
+	add_amount, _ := c.GetFloat("add_amount")
+	reduce_amount, _ := c.GetFloat("reduce_amount")
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
 
@@ -414,6 +426,8 @@ func (c *DialysisApiController) PostPrescription() {
 		DrhyWater:                  drhy_water,
 		DryWaterHour:               dry_water_hour,
 		WaterMachine:               water_machine,
+		AddAmount:                  add_amount,
+		ReduceAmount:               reduce_amount,
 	}
 
 	if appRole.UserType == 2 || appRole.UserType == 1 {
@@ -643,6 +657,8 @@ func (c *DialysisApiController) PostSoulution() {
 	dry_water_hour := c.GetString("dry_water_hour")
 	drhy_water := c.GetString("drhy_water")
 	water_machine := c.GetString("water_machine")
+	add_amount, _ := c.GetFloat("add_amount")
+	reduce_amount, _ := c.GetFloat("reduce_amount")
 	var prescription_doctor int64
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentAppId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 
@@ -760,6 +776,8 @@ func (c *DialysisApiController) PostSoulution() {
 		DryWaterHour:               dry_water_hour,
 		DrhyWater:                  drhy_water,
 		WaterMachine:               water_machine,
+		AddAmount:                  add_amount,
+		ReduceAmount:               reduce_amount,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -3457,7 +3475,7 @@ func (c *DialysisApiController) CreateRemindDoctorAdvice() {
 		advice.UserOrgId = adminUserInfo.CurrentOrgId
 		advice.PatientId = patient
 		advice.AdviceDoctor = adminUserInfo.AdminUser.Id
-
+		advice.IsSettle = 2
 		if adviceNameM["advice_name"] == nil || reflect.TypeOf(adviceNameM["advice_name"]).String() != "string" {
 			utils.ErrorLog("advice_name")
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -3584,7 +3602,7 @@ func (c *DialysisApiController) CreateRemindDoctorAdvice() {
 					child.UserOrgId = adminUserInfo.CurrentOrgId
 					child.PatientId = patient
 					child.AdviceDoctor = adminUserInfo.AdminUser.Id
-
+					child.IsSettle = 2
 					if childMap["advice_name"] == nil || reflect.TypeOf(childMap["advice_name"]).String() != "string" {
 						utils.ErrorLog("child advice_name")
 						return
@@ -3690,15 +3708,16 @@ func (c *DialysisApiController) GetSolution() {
 	solution, err := service.MobileGetDialysisSolutionByModeIdSix(adminUserInfo.CurrentOrgId, patient_id, mode_id)
 	prescription, err := service.MobileGetLastDialysisPrescribeByModeIdSix(adminUserInfo.CurrentOrgId, patient_id, mode_id)
 	system_prescription, err := service.MobileGetSystemDialysisPrescribeByModeIdSix(adminUserInfo.CurrentOrgId, mode_id)
-
+	dialysisPrescription, _ := service.MobileGetLastDialysisPrescription(patient_id, adminUserInfo.CurrentOrgId)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 	}
 	c.ServeSuccessJSON(map[string]interface{}{
-		"solution":            solution,
-		"prescription":        prescription,
-		"system_prescription": system_prescription,
+		"solution":             solution,
+		"prescription":         prescription,
+		"system_prescription":  system_prescription,
+		"dialysisPrescription": dialysisPrescription,
 	})
 
 }
@@ -3802,7 +3821,7 @@ func (this *DialysisApiController) GetTodayMonitor() {
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 
-			if adminInfo.CurrentOrgId == 10395 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10340 {
+			if adminInfo.CurrentOrgId == 10395 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10340 || adminInfo.CurrentOrgId == 10432 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / 1000 / float64(totalMin) * 1000)
 
 				record.UltrafiltrationRate = ultrafiltration_rate
@@ -3830,7 +3849,7 @@ func (this *DialysisApiController) GetTodayMonitor() {
 
 	}
 
-	if adminInfo.CurrentOrgId == 10395 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10340 {
+	if adminInfo.CurrentOrgId == 10395 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10340 || adminInfo.CurrentOrgId == 10432 {
 
 		if ultrafiltration_rate > 0 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
@@ -4302,6 +4321,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 +4337,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 +4354,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 +4384,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 +4528,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 +4590,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
 
@@ -4676,7 +4711,10 @@ func (c *DialysisApiController) GetSchedulePrintList() {
 	adminUserInfo := c.GetAdminUserInfo()
 
 	list, total, _ := service.GetSchedulePrintList(page, limit, schedulType, partitionType, keywords, theStartTime, adminUserInfo.CurrentOrgId)
-
+	for _, item := range list {
+		order, _ := service.GetLastOrder(item.UserOrgId, item.PatientId, item.ScheduleDate)
+		item.DialysisOrderTwenty = order
+	}
 	listOne, _ := service.GetSchedulePrintListOne(page, limit, schedulType, partitionType, keywords, theStartTime, adminUserInfo.CurrentOrgId)
 	numberList, _ := service.GetAllBedNumberSix(adminUserInfo.CurrentOrgId)
 	c.ServeSuccessJSON(map[string]interface{}{
@@ -4687,3 +4725,720 @@ 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,
+	})
+
+}
+
+func (this *DialysisApiController) ExcutionDoctorAdvice() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	is_open, _ := this.GetInt64("is_open")
+	idsStr := this.GetString("str")
+	recordIDStrs := strings.Split(idsStr, ",")
+	start_time := this.GetString("advice_date")
+	exec_time, _ := this.GetInt64("exec_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 {
+			//fmt.Println(err)
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	config, _ := service.GetDrugOpenConfigOne(orgId)
+	pharmacyConfig, _ := service.FindPharmacyConfig(orgId)
+	storeHouseConfig, _ := service.GetAllStoreHouseConfig(orgId)
+	//his医嘱
+	if is_open == 1 {
+
+		groupList, _ := service.GetHisExcutionDoctorAdviceListGroupList(recordIDStrs, startTime, orgId)
+		//查找未执行医嘱
+		list, _ := service.GetHisExcutionDoctorAdviceList(recordIDStrs, startTime, orgId)
+		for _, item := range list {
+			if item.Checker == this.GetAdminUserInfo().AdminUser.Id {
+				this.ServeSuccessJSON(map[string]interface{}{
+					"msg": "3",
+				})
+				return
+			}
+		}
+		for _, item := range groupList {
+			for _, it := range list {
+				if item.DrugId == it.DrugId {
+					item.ChildDoctorAdvice = append(item.ChildDoctorAdvice, it)
+				}
+			}
+		}
+
+		for _, item := range groupList {
+			medical, _ := service.GetBaseDrugMedical(item.DrugId)
+			var sum_out_count int64
+			for _, it := range item.ChildDoctorAdvice {
+				var prescribing_number int64
+				stringPrescribingNumber := strconv.FormatFloat(it.PrescribingNumber, 'f', -1, 64)
+				parseIntPrescribingNumber, _ := strconv.ParseInt(stringPrescribingNumber, 10, 64)
+				if it.PrescribingNumberUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
+					prescribing_number = parseIntPrescribingNumber * medical.MinNumber
+				}
+				if it.PrescribingNumberUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
+					prescribing_number = parseIntPrescribingNumber
+				}
+				if it.PrescribingNumberUnit == medical.MinUnit && medical.MaxUnit == medical.MinUnit {
+					prescribing_number = parseIntPrescribingNumber
+				}
+				sum_out_count += prescribing_number
+				drugStockOut, _ := service.GetDrugSumOutCountByDrugId(it.DrugId, orgId)
+				//库存不足
+				if sum_out_count > drugStockOut.FlushCount {
+					this.ServeSuccessJSON(map[string]interface{}{
+						"msg":  "2",
+						"drug": medical,
+					})
+					return
+				}
+			}
+		}
+		creater := this.GetAdminUserInfo().AdminUser.Id
+		//执行出库逻辑
+		for _, item := range list {
+			hisadvice := &models.HisDoctorAdviceInfo{
+				ID:                    item.ID,
+				UserOrgId:             item.UserOrgId,
+				PatientId:             item.PatientId,
+				AdviceType:            item.AdviceType,
+				AdviceDate:            item.AdviceDate,
+				StartTime:             item.StartTime,
+				AdviceName:            item.AdviceName,
+				AdviceDesc:            item.AdviceDesc,
+				ReminderDate:          item.ReminderDate,
+				SingleDose:            item.SingleDose,
+				SingleDoseUnit:        item.SingleDoseUnit,
+				DrugSpec:              item.DrugSpec,
+				DrugSpecUnit:          item.DrugSpecUnit,
+				PrescribingNumber:     item.PrescribingNumber,
+				PrescribingNumberUnit: item.PrescribingNumberUnit,
+				DeliveryWay:           item.DeliveryWay,
+				ExecutionFrequency:    item.ExecutionFrequency,
+				AdviceDoctor:          item.AdviceDoctor,
+				Status:                1,
+				CreatedTime:           item.CreatedTime,
+				UpdatedTime:           item.UpdatedTime,
+				AdviceAffirm:          item.AdviceAffirm,
+				Remark:                item.Remark,
+				StopTime:              item.StopTime,
+				StopReason:            item.StopReason,
+				StopDoctor:            item.StopDoctor,
+				StopState:             item.StopState,
+				ParentId:              item.ParentId,
+				ExecutionTime:         item.ExecutionTime,
+				ExecutionStaff:        creater,
+				ExecutionState:        item.ExecutionState,
+				Checker:               item.Checker,
+				RecordDate:            item.RecordDate,
+				DialysisOrderId:       item.DialysisOrderId,
+				CheckTime:             item.CheckTime,
+				CheckState:            item.CheckState,
+				RemindType:            item.RemindType,
+				FrequencyType:         item.FrequencyType,
+				DayCount:              item.DayCount,
+				WeekDay:               item.WeekDay,
+				TemplateId:            item.TemplateId,
+				Modifier:              item.Modifier,
+				Way:                   item.Way,
+				DrugId:                item.DrugId,
+				ExecutionFrequencyId:  item.ExecutionFrequencyId,
+			}
+			medical, _ := service.GetBaseDrugMedical(item.DrugId)
+			if medical.IsUse == 2 {
+				if config.IsOpen != 1 {
+					if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
+						service.HisDrugsDelivery(item.UserOrgId, item.ExecutionStaff, hisadvice)
+
+					}
+					//不通过药房发药
+					if pharmacyConfig.IsOpen != 1 {
+						service.HisDrugsDelivery(item.UserOrgId, item.ExecutionStaff, hisadvice)
+					}
+					//查询默认仓库
+					storeHouseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
+					//查询默认仓库剩余多少库存
+					var sum_count int64
+					stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+					for _, its := range stockInfo {
+						if its.MaxUnit == medical.MaxUnit {
+							its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+						}
+						sum_count += its.StockMaxNumber + its.StockMinNumber
+					}
+					service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
+					service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
+				}
+			}
+
+			info := models.HisDoctorAdviceInfo{
+				ExecutionStaff: this.GetAdminUserInfo().AdminUser.Id,
+				ExecutionTime:  exec_time,
+				ExecutionState: 1,
+				UpdatedTime:    time.Now().Unix(),
+			}
+			//执行医嘱
+			service.UpdateHisDoctorAdviceExecution(info, item.ID)
+
+			key := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":doctor_advices"
+			redis := service.RedisClient()
+			//清空key 值
+			redis.Set(key, "", time.Second)
+			keyTwo := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":advice_list_all"
+
+			redis.Set(keyTwo, "", time.Second)
+			keyThree := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":his_doctor_advice"
+			redis.Set(keyThree, "", time.Second)
+			toTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", start_time)
+			theTime := toTime.Format("2006-01-02")
+
+			fmt.Println("theTIME", theTime)
+			keyFour := "scheduals_" + theTime + "_" + strconv.FormatInt(orgId, 10)
+
+			redis.Set(keyFour, "", time.Second)
+			keyFive := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":his_advices_list_all"
+			redis.Set(keyFive, "", time.Second)
+		}
+
+	} else {
+
+		groupList, _ := service.GetExcutionDoctorAdviceGroupList(recordIDStrs, startTime, orgId)
+		//查找未执行医嘱
+		list, _ := service.GetExcutionDoctorAdviceList(recordIDStrs, startTime, orgId)
+		for _, item := range groupList {
+			for _, it := range list {
+				if item.DrugId == it.DrugId {
+					item.ChildDoctorAdvice = append(item.ChildDoctorAdvice, it)
+				}
+			}
+		}
+
+		for _, item := range groupList {
+			medical, _ := service.GetBaseDrugMedical(item.DrugId)
+			var sum_out_count int64
+			for _, it := range item.ChildDoctorAdvice {
+				var prescribing_number int64
+				stringPrescribingNumber := strconv.FormatFloat(it.PrescribingNumber, 'f', -1, 64)
+				parseIntPrescribingNumber, _ := strconv.ParseInt(stringPrescribingNumber, 10, 64)
+				if it.PrescribingNumberUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
+					prescribing_number = parseIntPrescribingNumber * medical.MinNumber
+				}
+				if it.PrescribingNumberUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
+					prescribing_number = parseIntPrescribingNumber
+				}
+				if it.PrescribingNumberUnit == medical.MinUnit && medical.MaxUnit == medical.MinUnit {
+					prescribing_number = parseIntPrescribingNumber
+				}
+				sum_out_count += prescribing_number
+				drugStockOut, _ := service.GetDrugSumOutCountByDrugId(it.DrugId, orgId)
+				//库存不足
+				if sum_out_count > drugStockOut.FlushCount {
+					this.ServeSuccessJSON(map[string]interface{}{
+						"msg":  "2",
+						"drug": medical,
+					})
+					return
+				}
+			}
+		}
+
+		for _, item := range list {
+			medical, _ := service.GetBaseDrugMedical(item.DrugId)
+			dadvice := &models.DoctorAdvice{
+				ID:                    item.ID,
+				UserOrgId:             item.UserOrgId,
+				PatientId:             item.PatientId,
+				AdviceType:            item.AdviceType,
+				AdviceDate:            item.AdviceDate,
+				StartTime:             item.StartTime,
+				AdviceName:            item.AdviceName,
+				AdviceDesc:            item.AdviceDesc,
+				ReminderDate:          item.ReminderDate,
+				SingleDose:            item.SingleDose,
+				SingleDoseUnit:        item.SingleDoseUnit,
+				DrugSpec:              item.DrugSpec,
+				DrugSpecUnit:          item.DrugSpecUnit,
+				PrescribingNumber:     item.PrescribingNumber,
+				PrescribingNumberUnit: item.PrescribingNumberUnit,
+				DeliveryWay:           item.DeliveryWay,
+				ExecutionFrequency:    item.ExecutionFrequency,
+				AdviceDoctor:          item.AdviceDoctor,
+				Status:                1,
+				CreatedTime:           item.CreatedTime,
+				UpdatedTime:           item.UpdatedTime,
+				AdviceAffirm:          item.AdviceAffirm,
+				Remark:                item.Remark,
+				StopTime:              item.StopTime,
+				StopReason:            item.StopReason,
+				StopDoctor:            item.StopDoctor,
+				StopState:             item.StopState,
+				ParentId:              item.ParentId,
+				ExecutionTime:         item.ExecutionTime,
+				ExecutionStaff:        item.ExecutionStaff,
+				ExecutionState:        item.ExecutionState,
+				Checker:               item.Checker,
+				RecordDate:            item.ReminderDate,
+				DialysisOrderId:       item.DialysisOrderId,
+				CheckTime:             item.CheckTime,
+				CheckState:            item.CheckState,
+				RemindType:            item.RemindType,
+				FrequencyType:         item.FrequencyType,
+				DayCount:              item.DayCount,
+				WeekDay:               item.WeekDay,
+				TemplateId:            item.TemplateId,
+				Modifier:              item.Modifier,
+				Way:                   item.Way,
+				DrugId:                item.DrugId,
+			}
+			if medical.IsUse == 2 {
+				if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
+					service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, dadvice)
+				}
+				if pharmacyConfig.IsOpen != 1 {
+					service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, dadvice)
+				}
+
+				//更新字典里面的库存
+				stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+				var sum_count int64
+				for _, its := range stockInfo {
+					baseDrug, _ := service.GetBaseDrugMedical(its.DrugId)
+					if its.MaxUnit == baseDrug.MaxUnit {
+						its.StockMaxNumber = its.StockMaxNumber * baseDrug.MinNumber
+					}
+					sum_count += its.StockMaxNumber + its.StockMinNumber
+				}
+				service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
+				//剩余库存
+				service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
+			}
+
+			info := models.DoctorAdvice{
+				ExecutionStaff: this.GetAdminUserInfo().AdminUser.Id,
+				ExecutionTime:  exec_time,
+				ExecutionState: 1,
+				UpdatedTime:    time.Now().Unix(),
+			}
+			//执行医嘱
+			service.UpdateDoctorAdviceExecution(info, item.ID)
+		}
+
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"msg": "1",
+	})
+	return
+}
+
+func (this *DialysisApiController) CheckNewDoctorAdvice() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	idsStr := this.GetString("str")
+	recordIDStrs := strings.Split(idsStr, ",")
+	start_time := this.GetString("advice_date")
+	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 {
+			//fmt.Println(err)
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+
+	config, _ := service.FindXTHisRecordByOrgIdSix(orgId)
+
+	if config.IsOpen == 1 {
+
+		creater := this.GetAdminUserInfo().AdminUser.Id
+		//查询未核对的医嘱
+		advicelist, _ := service.GetHisCheckDoctorAdvice(orgId, recordIDStrs, startTime)
+		for _, item := range advicelist {
+			if item.ExecutionStaff == creater {
+				this.ServeSuccessJSON(map[string]interface{}{
+					"msg":    "2",
+					"advice": item,
+				})
+				return
+			}
+
+			service.CheckHisDoctorAdvice(item.ID, creater)
+
+			key := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":doctor_advices"
+			redis := service.RedisClient()
+			//清空key 值
+			redis.Set(key, "", time.Second)
+			keyTwo := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":advice_list_all"
+			redis.Set(keyTwo, "", time.Second)
+			keyThree := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":his_doctor_advice"
+			redis.Set(keyThree, "", time.Second)
+			theTime := time.Now()
+			recordDate := theTime.Format("2006-01-02")
+			keyFour := "scheduals_" + recordDate + "_" + strconv.FormatInt(orgId, 10)
+
+			redis.Set(keyFour, "", time.Second)
+			keyFive := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":his_advices_list_all"
+			redis.Set(keyFive, "", time.Second)
+
+		}
+	} else {
+
+		//查询未核对的医嘱
+		advicelist, _ := service.GetCheckDoctorAdvice(orgId, recordIDStrs, startTime)
+		creater := this.GetAdminUserInfo().AdminUser.Id
+		for _, item := range advicelist {
+			if item.ExecutionStaff == creater {
+				this.ServeSuccessJSON(map[string]interface{}{
+					"msg":    "2",
+					"advice": item,
+				})
+				return
+			}
+
+			service.CheckDoctorAdvice(item.ID, creater)
+			key := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":doctor_advices"
+			redis := service.RedisClient()
+			//清空key 值
+			redis.Set(key, "", time.Second)
+			keyTwo := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":advice_list_all"
+			redis.Set(keyTwo, "", time.Second)
+			keyThree := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":his_doctor_advice"
+			redis.Set(keyThree, "", time.Second)
+			theTime := time.Now()
+			recordDate := theTime.Format("2006-01-02")
+			keyFour := "scheduals_" + recordDate + "_" + strconv.FormatInt(orgId, 10)
+
+			redis.Set(keyFour, "", time.Second)
+			keyFive := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":his_advices_list_all"
+			redis.Set(keyFive, "", time.Second)
+		}
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"msg": "1",
+	})
+	return
+
+}
+
+func (this *DialysisApiController) SettleNewDoctorAdvice() {
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	is_open, _ := this.GetInt64("is_open")
+	idsStr := this.GetString("str")
+	recordIDStrs := strings.Split(idsStr, ",")
+	start_time := this.GetString("advice_date")
+	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()
+	}
+
+	if is_open == 1 {
+		service.SettleHisNewDoctorAdvice(recordIDStrs, startTime, orgId)
+	} else {
+		service.SettleNewDoctorAdvice(recordIDStrs, startTime, orgId)
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"msg": "1",
+	})
+	return
+}
+
+func (this *DialysisApiController) ExcutionDoctorAdviceById() {
+
+	advice_id, _ := this.GetInt64("advice_id")
+	start_time := this.GetString("advice_date")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	config, _ := service.FindXTHisRecordByOrgIdSix(orgId)
+	exec_time, _ := this.GetInt64("exec_time")
+
+	//his医嘱
+	if config.IsOpen == 1 {
+
+		//查询医嘱
+		advice, _ := service.GetHisDocById(advice_id, orgId)
+		if advice.Checker == this.GetAdminUserInfo().AdminUser.Id {
+			this.ServeSuccessJSON(map[string]interface{}{
+				"msg": "3",
+			})
+			return
+		}
+		medical, _ := service.GetBaseDrugMedical(orgId)
+		var prescribing_number int64
+		stringPrescribingNumber := strconv.FormatFloat(advice.PrescribingNumber, 'f', -1, 64)
+		parseIntPrescribingNumber, _ := strconv.ParseInt(stringPrescribingNumber, 10, 64)
+		if advice.PrescribingNumberUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
+			prescribing_number = parseIntPrescribingNumber * medical.MinNumber
+		}
+		if advice.PrescribingNumberUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
+			prescribing_number = parseIntPrescribingNumber
+		}
+		if advice.PrescribingNumberUnit == medical.MinUnit && medical.MaxUnit == medical.MinUnit {
+			prescribing_number = parseIntPrescribingNumber
+		}
+
+		drugStockOut, _ := service.GetDrugSumOutCountByDrugId(advice.DrugId, orgId)
+		//库存不足
+		if prescribing_number > drugStockOut.FlushCount {
+			this.ServeSuccessJSON(map[string]interface{}{
+				"msg":  "2",
+				"drug": medical,
+			})
+			return
+		}
+		info := models.HisDoctorAdviceInfo{
+			ExecutionStaff: this.GetAdminUserInfo().AdminUser.Id,
+			ExecutionTime:  exec_time,
+			ExecutionState: 1,
+			UpdatedTime:    time.Now().Unix(),
+		}
+		//执行医嘱
+		service.UpdateHisDoctorAdviceExecution(info, advice.ID)
+
+		key := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
+		redis := service.RedisClient()
+		//清空key 值
+		redis.Set(key, "", time.Second)
+		keyTwo := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":advice_list_all"
+
+		redis.Set(keyTwo, "", time.Second)
+		keyThree := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":his_doctor_advice"
+		redis.Set(keyThree, "", time.Second)
+		toTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", start_time)
+		theTime := toTime.Format("2006-01-02")
+
+		fmt.Println("theTIME", theTime)
+		keyFour := "scheduals_" + theTime + "_" + strconv.FormatInt(orgId, 10)
+
+		redis.Set(keyFour, "", time.Second)
+		keyFive := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":his_advices_list_all"
+		redis.Set(keyFive, "", time.Second)
+
+		//出库
+		if prescribing_number <= drugStockOut.FlushCount {
+			pharmacyConfig, _ := service.FindPharmacyConfig(orgId)
+			//执行出库逻辑
+			hisadvice := &models.HisDoctorAdviceInfo{
+				ID:                    advice.ID,
+				UserOrgId:             advice.UserOrgId,
+				PatientId:             advice.PatientId,
+				AdviceType:            advice.AdviceType,
+				AdviceDate:            advice.AdviceDate,
+				StartTime:             advice.StartTime,
+				AdviceName:            advice.AdviceName,
+				AdviceDesc:            advice.AdviceDesc,
+				ReminderDate:          advice.ReminderDate,
+				SingleDose:            advice.SingleDose,
+				SingleDoseUnit:        advice.SingleDoseUnit,
+				DrugSpec:              advice.DrugSpec,
+				DrugSpecUnit:          advice.DrugSpecUnit,
+				PrescribingNumber:     advice.PrescribingNumber,
+				PrescribingNumberUnit: advice.PrescribingNumberUnit,
+				DeliveryWay:           advice.DeliveryWay,
+				ExecutionFrequency:    advice.ExecutionFrequency,
+				AdviceDoctor:          advice.AdviceDoctor,
+				Status:                1,
+				CreatedTime:           advice.CreatedTime,
+				UpdatedTime:           advice.UpdatedTime,
+				AdviceAffirm:          advice.AdviceAffirm,
+				Remark:                advice.Remark,
+				StopTime:              advice.StopTime,
+				StopReason:            advice.StopReason,
+				StopDoctor:            advice.StopDoctor,
+				StopState:             advice.StopState,
+				ParentId:              advice.ParentId,
+				ExecutionTime:         advice.ExecutionTime,
+				ExecutionStaff:        this.GetAdminUserInfo().AdminUser.Id,
+				ExecutionState:        advice.ExecutionState,
+				Checker:               advice.Checker,
+				RecordDate:            advice.RecordDate,
+				DialysisOrderId:       advice.DialysisOrderId,
+				CheckTime:             advice.CheckTime,
+				CheckState:            advice.CheckState,
+				RemindType:            advice.RemindType,
+				FrequencyType:         advice.FrequencyType,
+				DayCount:              advice.DayCount,
+				WeekDay:               advice.WeekDay,
+				TemplateId:            advice.TemplateId,
+				Modifier:              advice.Modifier,
+				Way:                   advice.Way,
+				DrugId:                advice.DrugId,
+				ExecutionFrequencyId:  advice.ExecutionFrequencyId,
+			}
+			if medical.IsUse == 2 {
+				if config.IsOpen != 1 {
+					if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
+						service.HisDrugsDelivery(advice.UserOrgId, advice.ExecutionStaff, hisadvice)
+
+					}
+					//不通过药房发药
+					if pharmacyConfig.IsOpen != 1 {
+						service.HisDrugsDelivery(advice.UserOrgId, advice.ExecutionStaff, hisadvice)
+					}
+					//查询默认仓库
+					storeHouseConfig, _ := service.GetAllStoreHouseConfig(advice.UserOrgId)
+					//查询默认仓库剩余多少库存
+					var sum_count int64
+					stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, advice.UserOrgId, advice.DrugId)
+					for _, its := range stockInfo {
+						if its.MaxUnit == medical.MaxUnit {
+							its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+						}
+						sum_count += its.StockMaxNumber + its.StockMinNumber
+					}
+					service.UpdateBaseDrugSumTwo(advice.DrugId, sum_count, advice.UserOrgId)
+					service.UpdateDrugStockCount(advice.DrugId, advice.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
+				}
+			}
+		}
+
+		this.ServeSuccessJSON(map[string]interface{}{
+			"msg": "1",
+		})
+		return
+	}
+
+	if config.IsOpen == 2 || config.IsOpen == 0 {
+
+		advice, _ := service.GetBloodDocById(advice_id, orgId)
+		medical, _ := service.GetBaseDrugMedical(orgId)
+		pharmacyConfig, _ := service.FindPharmacyConfig(orgId)
+		storeHouseConfig, _ := service.GetAllStoreHouseConfig(orgId)
+		var prescribing_number int64
+		stringPrescribingNumber := strconv.FormatFloat(advice.PrescribingNumber, 'f', -1, 64)
+		parseIntPrescribingNumber, _ := strconv.ParseInt(stringPrescribingNumber, 10, 64)
+		if advice.PrescribingNumberUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
+			prescribing_number = parseIntPrescribingNumber * medical.MinNumber
+		}
+		if advice.PrescribingNumberUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
+			prescribing_number = parseIntPrescribingNumber
+		}
+		if advice.PrescribingNumberUnit == medical.MinUnit && medical.MaxUnit == medical.MinUnit {
+			prescribing_number = parseIntPrescribingNumber
+		}
+		drugStockOut, _ := service.GetDrugSumOutCountByDrugId(advice.DrugId, orgId)
+		//库存不足
+		if prescribing_number > drugStockOut.FlushCount {
+			this.ServeSuccessJSON(map[string]interface{}{
+				"msg":  "2",
+				"drug": medical,
+			})
+			return
+		}
+		info := models.DoctorAdvice{
+			ExecutionStaff: this.GetAdminUserInfo().AdminUser.Id,
+			ExecutionTime:  exec_time,
+			ExecutionState: 1,
+			UpdatedTime:    time.Now().Unix(),
+		}
+		//执行医嘱
+		service.UpdateDoctorAdviceExecution(info, advice.ID)
+
+		dadvice := &models.DoctorAdvice{
+			ID:                    advice.ID,
+			UserOrgId:             advice.UserOrgId,
+			PatientId:             advice.PatientId,
+			AdviceType:            advice.AdviceType,
+			AdviceDate:            advice.AdviceDate,
+			StartTime:             advice.StartTime,
+			AdviceName:            advice.AdviceName,
+			AdviceDesc:            advice.AdviceDesc,
+			ReminderDate:          advice.ReminderDate,
+			SingleDose:            advice.SingleDose,
+			SingleDoseUnit:        advice.SingleDoseUnit,
+			DrugSpec:              advice.DrugSpec,
+			DrugSpecUnit:          advice.DrugSpecUnit,
+			PrescribingNumber:     advice.PrescribingNumber,
+			PrescribingNumberUnit: advice.PrescribingNumberUnit,
+			DeliveryWay:           advice.DeliveryWay,
+			ExecutionFrequency:    advice.ExecutionFrequency,
+			AdviceDoctor:          advice.AdviceDoctor,
+			Status:                1,
+			CreatedTime:           advice.CreatedTime,
+			UpdatedTime:           advice.UpdatedTime,
+			AdviceAffirm:          advice.AdviceAffirm,
+			Remark:                advice.Remark,
+			StopTime:              advice.StopTime,
+			StopReason:            advice.StopReason,
+			StopDoctor:            advice.StopDoctor,
+			StopState:             advice.StopState,
+			ParentId:              advice.ParentId,
+			ExecutionTime:         advice.ExecutionTime,
+			ExecutionStaff:        advice.ExecutionStaff,
+			ExecutionState:        advice.ExecutionState,
+			Checker:               advice.Checker,
+			RecordDate:            advice.ReminderDate,
+			DialysisOrderId:       advice.DialysisOrderId,
+			CheckTime:             advice.CheckTime,
+			CheckState:            advice.CheckState,
+			RemindType:            advice.RemindType,
+			FrequencyType:         advice.FrequencyType,
+			DayCount:              advice.DayCount,
+			WeekDay:               advice.WeekDay,
+			TemplateId:            advice.TemplateId,
+			Modifier:              advice.Modifier,
+			Way:                   advice.Way,
+			DrugId:                advice.DrugId,
+		}
+		if medical.IsUse == 2 {
+			if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
+				service.DrugsDelivery(advice.UserOrgId, advice.ExecutionStaff, dadvice)
+			}
+			if pharmacyConfig.IsOpen != 1 {
+				service.DrugsDelivery(advice.UserOrgId, advice.ExecutionStaff, dadvice)
+			}
+
+			//更新字典里面的库存
+			stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, advice.UserOrgId, advice.DrugId)
+			var sum_count int64
+			for _, its := range stockInfo {
+				baseDrug, _ := service.GetBaseDrugMedical(its.DrugId)
+				if its.MaxUnit == baseDrug.MaxUnit {
+					its.StockMaxNumber = its.StockMaxNumber * baseDrug.MinNumber
+				}
+				sum_count += its.StockMaxNumber + its.StockMinNumber
+			}
+			service.UpdateBaseDrugSumTwo(advice.DrugId, sum_count, advice.UserOrgId)
+			//剩余库存
+			service.UpdateDrugStockCount(advice.DrugId, advice.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
+		}
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"msg": "1",
+	})
+	return
+
+}

controllers/dialysis_record_api_controller.go

@@ -787,7 +787,8 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 	blood_access_id, _ := this.GetInt64("blood_access_id")
 	bedID, _ := this.GetInt64("bed")
 	nuclein_date := this.GetString("nuclein_date")
-
+	schedule_remark := this.GetString("schedule_remark")
+	order_remark := this.GetString("order_remark")
 	if patientID <= 0 || len(recordDateStr) == 0 || nurseID <= 0 || bedID <= 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -1001,9 +1002,13 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 		DialysisIrrigation:     dialysis_irrigation,
 		BloodAccessId:          blood_access_id,
 		NucleinDate:            theNucleinDate,
+		ScheduleRemark:         schedule_remark,
+		OrderRemark:            order_remark,
 	}
 
 	createErr := service.MobileCreateDialysisOrder(adminUserInfo.CurrentOrgId, patientID, dialysisRecord)
+	//更新患者表排班备注
+	service.UpdateMobilePatient(adminUserInfo.CurrentOrgId, patientID, schedule_remark)
 	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":dialysis_order"
 	redis := service.RedisClient()
 	//清空key 值
@@ -1135,6 +1140,15 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 				record.TransmembranePressure = 60
 			}
 
+			//针对兰溪人民医院的需求
+			if adminUserInfo.CurrentOrgId == 10432 {
+				befor, _ := service.GetAssessmentBefor(adminUserInfo.CurrentOrgId, patientID, recordDate.Unix())
+				record.SystolicBloodPressure = befor.SystolicBloodPressure
+				record.DiastolicBloodPressure = befor.DiastolicBloodPressure
+				record.Temperature = befor.Temperature
+				record.PulseFrequency = befor.PulseFrequency
+			}
+
 			err := service.CreateMonitor(&record)
 			key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":monitor_records"
 
@@ -1398,8 +1412,8 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
 
 	err := service.UpdateAssessmentAfterDislysisRecord(&tempassessmentAfterDislysis)
 
-	if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 9675 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10340 || adminUserInfo.CurrentOrgId == 10414 {
-		fmt.Println("进来2332233333333333333333333333333333333我的")
+	if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 9675 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10340 || adminUserInfo.CurrentOrgId == 10414 || adminUserInfo.CurrentOrgId == 10432 {
+
 		evaluation, _ := service.MobileGetPredialysisEvaluationTwo(adminUserInfo.CurrentOrgId, patientID, recordDate.Unix())
 		if evaluation.SystolicBloodPressure == 0 {
 			pre := models.PredialysisEvaluation{
@@ -1530,6 +1544,8 @@ func (this *DialysisRecordAPIController) ModifyStartDialysis() {
 	dialysis_irrigation := this.GetString("dialysis_irrigation")
 	blood_access_id, _ := this.GetInt64("blood_access_id")
 	nuclein_date := this.GetString("nuclein_date")
+	schedule_remark := this.GetString("schedule_remark")
+	order_remark := this.GetString("order_remark")
 	if record_id == 0 {
 		this.ErrorLog("id:%v", record_id)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -1671,7 +1687,7 @@ func (this *DialysisRecordAPIController) ModifyStartDialysis() {
 		}
 
 	}
-	fmt.Println("theNucleinDate", theNucleinDate)
+
 	dialysisRecord := &models.DialysisOrder{
 		ID:                     record_id,
 		UserOrgId:              adminUserInfo.CurrentOrgId,
@@ -1693,9 +1709,16 @@ func (this *DialysisRecordAPIController) ModifyStartDialysis() {
 		DialysisIrrigation:     dialysis_irrigation,
 		BloodAccessId:          blood_access_id,
 		NucleinDate:            theNucleinDate,
+		ScheduleRemark:         schedule_remark,
+		OrderRemark:            order_remark,
 	}
 
 	updateErr := service.ModifyStartDialysisOrder(dialysisRecord)
+
+	order, _ := service.GetLastPatientOrder(record_id)
+
+	service.UpdateMobilePatient(adminUserInfo.CurrentOrgId, order.PatientId, schedule_remark)
+
 	redis := service.RedisClient()
 	key := strconv.FormatInt(tempDialysisRecord.UserOrgId, 10) + ":" + strconv.FormatInt(tempDialysisRecord.PatientId, 10) + ":" + strconv.FormatInt(tempDialysisRecord.DialysisDate, 10) + ":dialysis_order"
 	redis.Set(key, "", time.Second)

controllers/doctors_api_controller.go

@@ -29,6 +29,7 @@ func DoctorApiRegistRouters() {
 	beego.Router("/api/patients/modifydryweightdata", &DoctorsApiController{}, "Get:ModifydryWeightData")
 	beego.Router("/api/patient/deletedryweight", &DoctorsApiController{}, "Delete:DeleteDryWeight")
 	beego.Router("/api/schedule/advices", &DoctorsApiController{}, "Get:ScheduleAdvices")
+	beego.Router("/api/schedule/new/advices", &DoctorsApiController{}, "Get:GetScheduleAdvicesList")
 	beego.Router("/api/schedule/getdoctoradvicecount", &DoctorsApiController{}, "Get:GetDoctorAdviceCount")
 	beego.Router("/api/patient/savevasularaccess", &DoctorsApiController{}, "Get:SaveVasularAccess")
 	beego.Router("/api/patient/getallvascualraccesslist", &DoctorsApiController{}, "Get:GetAllVacualAccessList")
@@ -88,112 +89,67 @@ func (c *DoctorsApiController) ScheduleAdvices() {
 	adminUserInfo := c.GetAdminUserInfo()
 	orgID := adminUserInfo.CurrentOrgId
 
-	scheduals, err := service.MobileGetScheduleDoctorAdvicesOne(orgID, date.Unix(), adviceType, patientType, adminUserInfo.AdminUser.Id, delivery_way, schedule_type, partition_type, patient_id, excution_way)
-	hisAdvices, _ := service.GetHisDoctorAdvicesOne(orgID, date.Unix(), delivery_way, schedule_type, partition_type, patient_id, excution_way)
-
-	project, _ := service.GetPCHisPrescriptionProject(orgID, date.Unix(), delivery_way, patientType, partition_type, patient_id, excution_way)
-	//project, _ := service.GetPCHisPrescriptionProject(orgID, date.Unix(), delivery_way, patientType, partition_type, patient_id)
-	for _, item := range project {
-		index := 0
-		for _, subItem := range item.HisPrescriptionTeamProject {
-
-			if subItem.HisProject.CostClassify != 3 {
-				subItem.IsCheckTeam = 2
-				item.HisPrescriptionProject = append(item.HisPrescriptionProject, subItem)
-			}
+	config, _ := service.GetHisDoctorConfig(orgID)
+	project_config, _ := service.GetHisProjectConfig(orgID)
 
-			if subItem.HisProject.CostClassify == 3 {
-				subItem.IsCheckTeam = 1
-				index = index + 1
-				if index == 1 {
-					item.HisPrescriptionProject = append(item.HisPrescriptionProject, subItem)
+	if config.IsOpen == 0 || config.IsOpen == 2 {
+		scheduals, err := service.MobileGetScheduleDoctorAdvicesOne(orgID, date.Unix(), adviceType, patientType, adminUserInfo.AdminUser.Id, delivery_way, schedule_type, partition_type, patient_id, excution_way, 0)
+		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,
+				"config":         config,
+				"project_config": project_config,
+			})
 		}
 	}
-	//for _, item := range project {
-	//	index := 0
-	//	for _, subItem := range item.HisPrescriptionTeamProject {
-	//
-	//		//获取所有的患者
-	//		patients, _ := service.GetAllPatientListByListTwo(orgID)
-	//
-	//		//获取所有床位
-	//		numberList, _ := service.GetAllDeviceNumberByListOne(orgID)
-	//
-	//		//获取透析处方
-	//		prescriptions, _ := service.GetAllPrescriptionByListOne(orgID, date.Unix())
-	//
-	//		//获取上机
-	//		dialysisOrders, _ := service.GetAllDialysisOrdersByListTwo(orgID, date.Unix())
-	//		for key, item := range project {
-	//			for _, patient := range patients {
-	//				if item.PatientId == patient.ID {
-	//					project[key].SchedualPatient = patient
-	//					break
-	//				}
-	//			}
-	//			// 获取床位信息
-	//			for _, it := range numberList {
-	//				if item.BedId == it.ID {
-	//					project[key].DeviceNumber = it
-	//					break
-	//				}
-	//			}
-	//
-	//			// 获取处方
-	//			for _, it := range prescriptions {
-	//				if item.PatientId == it.PatientId {
-	//					project[key].Prescription = it
-	//					break
-	//				}
-	//			}
-	//
-	//			//获取上机
-	//			for _, it := range dialysisOrders {
-	//				if item.PatientId == it.PatientId {
-	//					project[key].DialysisOrder = it
-	//					break
-	//				}
-	//			}
-	//		}
-	//		if subItem.HisProject.CostClassify != 3 {
-	//			subItem.IsCheckTeam = 2
-	//			item.HisPrescriptionProject = append(item.HisPrescriptionProject, subItem)
-	//		}
-	//
-	//		if subItem.HisProject.CostClassify == 3 {
-	//			subItem.IsCheckTeam = 1
-	//			index = index + 1
-	//			if index == 1 {
-	//				item.HisPrescriptionProject = append(item.HisPrescriptionProject, subItem)
-	//			}
-	//		}
-	//	}
-	//}
-	config, _ := service.GetHisDoctorConfig(orgID)
-	project_config, _ := service.GetHisProjectConfig(orgID)
+	if config.IsOpen == 1 {
+		hisAdvices, err := service.GetHisDoctorAdvicesOne(orgID, date.Unix(), delivery_way, schedule_type, partition_type, patient_id, excution_way, 0)
+		adminUser, _ := service.GetAllAdminUsers(orgID, adminUserInfo.CurrentAppId)
+		project, _ := service.GetPCHisPrescriptionProject(orgID, date.Unix(), delivery_way, patientType, partition_type, patient_id, excution_way)
+		for _, item := range project {
+			index := 0
+			for _, subItem := range item.HisPrescriptionTeamProject {
+
+				if subItem.HisProject.CostClassify != 3 {
+					subItem.IsCheckTeam = 2
+					item.HisPrescriptionProject = append(item.HisPrescriptionProject, subItem)
+				}
 
-	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)
+				if subItem.HisProject.CostClassify == 3 {
+					subItem.IsCheckTeam = 1
+					index = index + 1
+					if index == 1 {
+						item.HisPrescriptionProject = append(item.HisPrescriptionProject, subItem)
+					}
+				}
 			}
 		}
-		c.ServeSuccessJSON(map[string]interface{}{
-			"scheduals":      filtedScheduals,
-			"adminUser":      adminUser,
-			"hisAdvices":     hisAdvices,
-			"config":         config,
-			"project_config": project_config,
-			"project":        project,
-		})
+
+		if err != nil {
+			c.ErrorLog("获取排班信息失败:%v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		} else {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"adminUser":      adminUser,
+				"hisAdvices":     hisAdvices,
+				"config":         config,
+				"project_config": project_config,
+				"project":        project,
+			})
+		}
 	}
+
 }
 
 func (c *DoctorsApiController) GetAllDoctorAndNurse() {
@@ -1407,3 +1363,95 @@ func (this *DoctorsApiController) GetPatientInfo() {
 		return
 	}
 }
+
+func (c *DoctorsApiController) GetScheduleAdvicesList() {
+
+	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")
+	if adviceType != 1 && adviceType != 3 && adviceType != 2 {
+		adviceType = 0
+	}
+
+	if patientType != 1 && patientType != 2 {
+
+		patientType = 0
+	}
+
+	date, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", schedualDate)
+	if parseDateErr != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	adminUserInfo := c.GetAdminUserInfo()
+	orgID := adminUserInfo.CurrentOrgId
+
+	config, _ := service.GetHisDoctorConfig(orgID)
+	project_config, _ := service.GetHisProjectConfig(orgID)
+
+	if config.IsOpen == 0 || config.IsOpen == 2 {
+		scheduals, err := service.MobileGetScheduleDoctorAdvicesOne(orgID, date.Unix(), adviceType, patientType, adminUserInfo.AdminUser.Id, delivery_way, schedule_type, partition_type, patient_id, excution_way, cost_type)
+		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,
+				"config":         config,
+				"project_config": project_config,
+			})
+		}
+	}
+	if config.IsOpen == 1 {
+		hisAdvices, err := service.GetHisDoctorAdvicesOne(orgID, date.Unix(), delivery_way, schedule_type, partition_type, patient_id, excution_way, cost_type)
+		adminUser, _ := service.GetAllAdminUsers(orgID, adminUserInfo.CurrentAppId)
+		project, _ := service.GetPCHisPrescriptionProject(orgID, date.Unix(), delivery_way, patientType, partition_type, patient_id, excution_way)
+		for _, item := range project {
+			index := 0
+			for _, subItem := range item.HisPrescriptionTeamProject {
+
+				if subItem.HisProject.CostClassify != 3 {
+					subItem.IsCheckTeam = 2
+					item.HisPrescriptionProject = append(item.HisPrescriptionProject, subItem)
+				}
+
+				if subItem.HisProject.CostClassify == 3 {
+					subItem.IsCheckTeam = 1
+					index = index + 1
+					if index == 1 {
+						item.HisPrescriptionProject = append(item.HisPrescriptionProject, subItem)
+					}
+				}
+			}
+		}
+
+		if err != nil {
+			c.ErrorLog("获取排班信息失败:%v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		} else {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"adminUser":      adminUser,
+				"hisAdvices":     hisAdvices,
+				"config":         config,
+				"project_config": project_config,
+				"project":        project,
+			})
+		}
+	}
+
+}

controllers/drug_pharmacy_management_controller.go

@@ -486,6 +486,9 @@ func (this *PharmacyApiController) SaveSetting() {
 		Ctime:     time.Now().Unix(),
 	}
 
+	if is_open == 1 {
+		service.UpdateSettleOpenConfigOne(orgId, 2)
+	}
 	//查找是否存在
 	_, errcode := service.GetConfigSettingIsExsit(orgId)
 	if errcode == gorm.ErrRecordNotFound {

controllers/drug_stock_api_contorller.go

@@ -3760,7 +3760,6 @@ func (c *StockDrugApiController) CheckDrugOut() {
 	storeHouseConfig, _ := service.GetAllStoreHouseConfig(orgId)
 
 	for _, it := range warehousingOutInfoList {
-		fmt.Println("countunit23322332232323wo", it.CountUnit)
 		var total_count int64
 		var out_count int64
 		//查询剩余库存
@@ -3808,11 +3807,11 @@ func (c *StockDrugApiController) CheckDrugOut() {
 		medical, _ := service.GetBaseDrugMedical(it.DrugId)
 		////出库数量累加
 		var out_count_one int64
-		fmt.Println("it.count", it.CountUnit)
-		fmt.Println("MaxUnit", medical.MaxUnit)
-		fmt.Println("MinUnit", medical.MinUnit)
-		fmt.Println("count", it.Count)
-		fmt.Println("number", medical.MinNumber)
+		//fmt.Println("it.count", it.CountUnit)
+		//fmt.Println("MaxUnit", medical.MaxUnit)
+		//fmt.Println("MinUnit", medical.MinUnit)
+		//fmt.Println("count", it.Count)
+		//fmt.Println("number", medical.MinNumber)
 		if it.CountUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
 			out_count_one = it.Count * medical.MinNumber
 		}
@@ -3824,10 +3823,10 @@ func (c *StockDrugApiController) CheckDrugOut() {
 		if it.CountUnit == medical.MaxUnit && medical.MaxUnit == medical.MinUnit {
 			out_count_one = it.Count
 		}
-		fmt.Println("countone3232232323323232332332wo", out_count_one)
+		//fmt.Println("countone3232232323323232332332wo", out_count_one)
 		//增加出库数量
 		service.AddDrugCount(it.DrugId, it.OrgId, storeHouseConfig.DrugStorehouseOut, out_count_one)
-		fmt.Println("countunit23322332232323", it.CountUnit)
+		//fmt.Println("countunit23322332232323", it.CountUnit)
 
 	}
 	warehousingOutInfoListThree, _ := service.GetDrugWarehouseOutListById(warehouse_out_id, orgId)

controllers/gobal_config_api_controller.go

@@ -117,6 +117,8 @@ func GobalConfigRegistRouters() {
 	beego.Router("/api/changeprescriptionconfig", &GobalConfigApiController{}, "Get:ChangePrescriptionConfig")
 
 	beego.Router("/api/changedrugopenconfig", &GobalConfigApiController{}, "Get:ChangeDrugOpenConfig")
+
+	beego.Router("/api/changesettleopenconfig", &GobalConfigApiController{}, "Get:ChangeSettleOpenConfig")
 }
 
 //provinces, _ := service.GetDistrictsByUpid(0)21
@@ -182,7 +184,9 @@ func (c *GobalConfigApiController) PostDrugStockConfig() {
 	}
 
 	errs, configs := service.FindDrugStockAutomaticReduceRecordByOrgId(org_id)
-
+	if is_open == 1 {
+		service.UpdateSettleOpenConfigOne(org_id, 2)
+	}
 	if errs == gorm.ErrRecordNotFound {
 		err := service.CreateDrugAutomaticReduceRecord(&config)
 		if err != nil {
@@ -1568,6 +1572,8 @@ func (c *GobalConfigApiController) GetAllIsOpenConfig() {
 	prescriptionConfig, _ := service.FindPrescriptionConfigById(adminUserInfo.CurrentOrgId)
 
 	drugOutConfig, _ := service.FindDrugOutConfigById(adminUserInfo.CurrentOrgId)
+
+	drugSettleConfig, _ := service.FindeDrugSettleConfigById(adminUserInfo.CurrentOrgId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"is_open_xt_his":         config.IsOpen,
 		"is_open_xt_his_project": project_config.IsOpen,
@@ -1575,6 +1581,7 @@ func (c *GobalConfigApiController) GetAllIsOpenConfig() {
 		"is_open_advice":         adviceSetting.IsAdviceOpen,
 		"is_prescription_advice": prescriptionConfig.IsOpen,
 		"is_open":                drugOutConfig.IsOpen,
+		"is_seetle_open":         drugSettleConfig.IsOpen,
 	})
 
 }
@@ -2499,6 +2506,11 @@ func (c *GobalConfigApiController) ChangeDrugOpenConfig() {
 
 	drug_out_open, _ := c.GetInt64("drug_out_open")
 	orgId := c.GetAdminUserInfo().CurrentOrgId
+	if drug_out_open == 1 {
+		service.UpdateDrugStockAutomaticReduceRecordOne(orgId, 2)
+		service.UpdatePharyConfig(orgId, 2)
+		service.UpdateSettleOpenConfigOne(orgId, 2)
+	}
 	_, errcode := service.GetDrugOpenConfig(orgId)
 	if errcode == gorm.ErrRecordNotFound {
 		config := models.DrugOutConfig{
@@ -2518,3 +2530,32 @@ func (c *GobalConfigApiController) ChangeDrugOpenConfig() {
 		})
 	}
 }
+
+func (this *GobalConfigApiController) ChangeSettleOpenConfig() {
+
+	drug_out_open, _ := this.GetInt64("drug_settle_open")
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	config := models.HisSettleStockConfig{
+		UserOrgId: orgId,
+		Ctime:     time.Now().Unix(),
+		Mtime:     0,
+		Status:    1,
+		IsOpen:    drug_out_open,
+	}
+
+	if drug_out_open == 1 {
+		service.UpdateDrugOutConfig(orgId, 2)
+		service.UpdateDrugStockAutomaticReduceRecordOne(orgId, 2)
+		service.UpdatePharyConfig(orgId, 2)
+	}
+	openConfig, errcode := service.GetSettleOpenConfig(orgId)
+	if errcode == gorm.ErrRecordNotFound {
+		service.CreateSettleOpenConfig(config)
+	} else if errcode == nil {
+		service.UpdateSettleOpenConfig(openConfig.ID, config)
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"msg": 1,
+	})
+}

controllers/his_api_controller.go

@@ -1930,7 +1930,7 @@ func (c *HisApiController) CreateHisPrescription() {
 							s.PatientId = patient_id
 							s.HisPatientId = his_patient_id
 							s.StartTime = pTime
-
+							s.IsSettle = 2
 							errcode := c.setAdviceWithJSON(&s, advice.(map[string]interface{}))
 							if errcode > 0 {
 								c.ServeFailJSONWithSGJErrorCode(errcode)
@@ -2832,14 +2832,26 @@ func (c *HisApiController) DeletePrescription() {
 
 		}
 	}
-	if drugStockConfig.IsOpen == 1 {
+	if c.GetAdminUserInfo().CurrentOrgId == 10387 {
+
 		if len(advices) > 0 {
 			for _, item := range advices {
 				creater := c.GetAdminUserInfo().AdminUser.Id
 				service.DrugAutoAddCancelInfo(item, creater)
 			}
 		}
+
+	} else {
+		if drugStockConfig.IsOpen == 1 {
+			if len(advices) > 0 {
+				for _, item := range advices {
+					creater := c.GetAdminUserInfo().AdminUser.Id
+					service.DrugAutoAddCancelInfo(item, creater)
+				}
+			}
+		}
 	}
+
 	c.ServeSuccessJSON(map[string]interface{}{
 		"msg": "删除成功",
 	})
@@ -2914,8 +2926,7 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 	defer redis.Close()
 
 	if err == nil {
-		if drugStockConfig.IsOpen == 1 {
-
+		if c.GetAdminUserInfo().CurrentOrgId == 10387 {
 			//查询是否在处方中出库
 			openConfig, _ := service.GetDrugOpenConfigOne(c.GetAdminUserInfo().CurrentOrgId)
 
@@ -2925,16 +2936,37 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 				if advice.ExecutionState == 1 {
 					creater := c.GetAdminUserInfo().AdminUser.Id
 					service.DrugAutoAddCancelInfo(&advice, creater)
-
 				}
-
 			}
 
 			//开启保存处方扣减功能
 			if openConfig.IsOpen == 1 {
 				creater := c.GetAdminUserInfo().AdminUser.Id
 				service.DrugAutoAddCancelInfo(&advice, creater)
+			}
+		} else {
+			if drugStockConfig.IsOpen == 1 {
+
+				//查询是否在处方中出库
+				openConfig, _ := service.GetDrugOpenConfigOne(c.GetAdminUserInfo().CurrentOrgId)
+
+				if openConfig.IsOpen != 1 {
+
+					//判断该医嘱是否执行了
+					if advice.ExecutionState == 1 {
+						creater := c.GetAdminUserInfo().AdminUser.Id
+						service.DrugAutoAddCancelInfo(&advice, creater)
+
+					}
+
+				}
+
+				//开启保存处方扣减功能
+				if openConfig.IsOpen == 1 {
+					creater := c.GetAdminUserInfo().AdminUser.Id
+					service.DrugAutoAddCancelInfo(&advice, creater)
 
+				}
 			}
 		}
 
@@ -5101,7 +5133,8 @@ 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 == "") {
 		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "押金不能为0")
 		return
 	}
@@ -5131,6 +5164,9 @@ func (c *HisApiController) GetUploadInfo() {
 	recordDateTime := theTime.Unix()
 	adminUser := c.GetAdminUserInfo()
 	var prescriptions []*models.HisPrescription
+
+	var prescriptionsOne []*models.HisPrescription
+
 	var start_time int64
 	var end_time int64
 
@@ -5143,8 +5179,12 @@ func (c *HisApiController) GetUploadInfo() {
 			if reg_type == 11 || reg_type == 1111 || reg_type == 1112 {
 
 				prescriptions, _ = service.GetPrescriptionByIdsTX(ids_arr, adminUser.CurrentOrgId, tx)
+
+				prescriptionsOne, _ = service.GetPrescriptionByIdsTxOne(ids_arr, adminUser.CurrentOrgId, tx)
 			} else {
 				prescriptions, _ = service.GetSettleHisPrescriptionTX(adminUser.CurrentOrgId, id, his_patient_id, recordDateTime, reg_type, tx)
+
+				prescriptionsOne, _ = service.GetSettleHisPrescriptionTXOne(adminUser.CurrentOrgId, id, his_patient_id, recordDateTime, reg_type, tx)
 			}
 		} else { //月结
 
@@ -5167,6 +5207,8 @@ func (c *HisApiController) GetUploadInfo() {
 			recordEndTime := theEndTime.Unix()
 			end_time = recordEndTime
 			prescriptions, _ = service.GetMonthHisPrescriptionTX(adminUser.CurrentOrgId, id, recordStartTime, recordEndTime, reg_type, tx)
+
+			prescriptionsOne, _ = service.GetMonthHisPrescriptionTXOne(adminUser.CurrentOrgId, id, his_patient_id, recordDateTime, reg_type, tx)
 		}
 
 		timestamp := time.Now().Unix()
@@ -5298,6 +5340,137 @@ func (c *HisApiController) GetUploadInfo() {
 				customs = append(customs, cus)
 			}
 		}
+
+		var goods []*models.DialysisBeforePrepareGoods
+		var newGoods []*models.NewDialysisBeforePrepareGoods
+		var oldGoods []*models.OldDialysisBeforePrepareGoods
+		var infos []*models.HisDoctorAdviceInfo
+		var infoList []*models.HisDoctorAdviceInfo
+		var hisAdvice []*models.HisDoctorAdviceInfo
+		var newGoodOne []*models.NewDialysisBeforePrepareGoods
+		houseConfig, _ := service.GetAllStoreHouseConfig(adminUser.CurrentOrgId)
+
+		settConfig, _ := service.GetSettleOpenConfigByOrgId(adminUser.CurrentOrgId)
+		if settConfig.IsOpen == 1 {
+			//判断库存的地方
+			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 _, info := range prescriptionsOne {
+				if info.Type == 1 {
+					hisAdvice = append(hisAdvice, info.HisDoctorAdviceInfo...)
+				}
+
+				if info.Type == 2 {
+					for _, sumItem := range info.HisPrescriptionProject {
+						if sumItem.Type == 3 {
+							var newGood models.NewDialysisBeforePrepareGoods
+
+							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
+							newGoodOne = append(newGoodOne, &newGood)
+						}
+					}
+				}
+			}
+
+			//判断
+			for _, itemOne := range infos {
+				for _, itemTwo := range hisAdvice {
+					if itemOne.DrugId == itemTwo.DrugId {
+						itemTwo.Child = append(itemTwo.ChildDoctorAdvice, itemOne)
+					}
+				}
+			}
+
+			for _, itemTwo := range hisAdvice {
+				medical, _ := service.GetBaseDrugMedical(itemTwo.DrugId)
+				var sum_out_count int64
+				for _, itemThree := range itemTwo.Child {
+					var prescribing_number int64
+					stringPrescribingNumber := strconv.FormatFloat(itemThree.PrescribingNumber, 'f', -1, 64)
+					parseIntPrescribingNumber, _ := strconv.ParseInt(stringPrescribingNumber, 10, 64)
+					if itemThree.PrescribingNumberUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
+						prescribing_number = parseIntPrescribingNumber * medical.MinNumber
+					}
+					if itemThree.PrescribingNumberUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
+						prescribing_number = parseIntPrescribingNumber
+					}
+					if itemThree.PrescribingNumberUnit == medical.MinUnit && medical.MaxUnit == medical.MinUnit {
+						prescribing_number = parseIntPrescribingNumber
+					}
+					sum_out_count += prescribing_number
+				}
+				drugStockOut, _ := service.GetDrugSumOutCountByDrugId(itemTwo.DrugId, adminUser.CurrentOrgId)
+
+				if sum_out_count > drugStockOut.FlushCount {
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg":  "2",
+						"drug": medical,
+					})
+					return
+				}
+			}
+
+			for _, itemOne := range newGoods {
+				for _, item := range newGoodOne {
+					if itemOne.ProjectId == item.ProjectId {
+						item.ChildNewDialysisBeforePrepareGoods = append(item.ChildNewDialysisBeforePrepareGoods, item)
+					}
+				}
+			}
+
+			for _, item := range newGoodOne {
+				var sum_out_count_one int64
+				good, _ := service.GetGoodInformationByGoodIdOne(item.GoodId)
+
+				for _, itemOne := range item.ChildNewDialysisBeforePrepareGoods {
+					sum_out_count_one += itemOne.Count
+				}
+				list, _ := service.GetStockGoodList(item.GoodId, adminUser.CurrentOrgId)
+				fmt.Println("sum_out_count_one", sum_out_count_one)
+				fmt.Println("list.FlushCount", list.FlushCount)
+				if sum_out_count_one > list.FlushCount {
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg":  "3",
+						"good": good,
+					})
+					return
+				}
+			}
+		}
+
 		for _, item := range customs {
 			var advice_id int64 = 0
 			var project_id int64 = 0
@@ -5354,6 +5527,7 @@ func (c *HisApiController) GetUploadInfo() {
 		if dec_way == "true" {
 
 			tmpstring := strconv.FormatInt(order.ID, 10)
+
 			//扣押金
 			errmsg = service.SpendDeposit(c.GetAdminUserInfo().CurrentOrgId, id, c.GetAdminUserInfo().AdminUser.Id, tmpstring, decimal)
 			order.Decimal = decimal
@@ -5364,21 +5538,18 @@ 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
 
+		if err == nil {
 			for _, info := range prescriptions {
 				if info.Type == 1 {
-					infos = append(infos, info.HisDoctorAdviceInfo...)
+					infoList = append(infoList, info.HisDoctorAdviceInfo...)
 				}
 				if info.Type == 2 {
 					for _, sumItem := range info.HisPrescriptionProject {
 						if sumItem.Type == 3 {
 							var good models.DialysisBeforePrepareGoods
 							var newGood models.NewDialysisBeforePrepareGoods
+							var oldGood models.OldDialysisBeforePrepareGoods
 							good.GoodId = sumItem.GoodInfo.ID
 							good.GoodTypeId = sumItem.GoodInfo.GoodTypeId
 							count, _ := strconv.Atoi(sumItem.Count)
@@ -5394,18 +5565,80 @@ func (c *HisApiController) GetUploadInfo() {
 							newGood.StorehouseId = houseConfig.StorehouseOutInfo
 							newGood.ProjectId = sumItem.ID
 							newGoods = append(newGoods, &newGood)
+
+							oldGood.GoodId = sumItem.GoodInfo.ID
+							oldGood.GoodTypeId = sumItem.GoodInfo.GoodTypeId
+							count3, _ := strconv.Atoi(sumItem.Count)
+							oldGood.Count = int64(count3)
+							oldGood.StorehouseId = houseConfig.StorehouseOutInfo
+							oldGood.ProjectId = sumItem.ID
+							oldGood.RecordDate = sumItem.RecordDate
+
+							oldGoods = append(oldGoods, &oldGood)
 						}
 
 					}
 
 				}
 			}
-			for _, item := range infos {
-				service.HisDrugsDelivery(item.UserOrgId, adminUser.AdminUser.Id, item)
-				//service.DrugAutoAddCancelInfo(item, adminUser.AdminUser.Id)
+			if settConfig.IsOpen == 1 {
+				fmt.Println("infos23233232232323323233223wo", infoList)
+				for _, item := range infoList {
+					medical, _ := service.GetBaseDrugMedical(item.DrugId)
+					service.HisDrugsDelivery(item.UserOrgId, adminUser.AdminUser.Id, item)
+					//查询默认仓库
+					storeHouseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
+					//查询默认仓库剩余多少库存
+					var sum_count int64
+					stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+					for _, its := range stockInfo {
+						if its.MaxUnit == medical.MaxUnit {
+							its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+						}
+						sum_count += its.StockMaxNumber + its.StockMinNumber
+					}
+					service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
+					service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
+				}
+
+				for _, item := range oldGoods {
+					dialyPrepareOne := models.DialysisBeforePrepare{
+						GoodTypeId:   item.GoodTypeId,
+						GoodId:       item.GoodId,
+						PatientId:    item.PatientId,
+						RecordDate:   item.RecordDate,
+						UserOrgId:    item.UserOrgId,
+						Count:        item.Count,
+						Ctime:        time.Now().Unix(),
+						Creater:      adminUser.AdminUser.Id,
+						CommdityCode: item.CommdityCode,
+						Status:       1,
+						StorehouseId: houseConfig.StorehouseOutInfo,
+					}
+					err = service.CreateDialysisBeforePrepareOne(&dialyPrepareOne)
+				}
 
+				service.ConsumablesDeliveryTotal(adminUser.CurrentOrgId, his.PatientId, his.RecordDate, goods, newGoods, adminUser.AdminUser.Id)
+				//查询默认仓库
+				//storeHouseConfig, _ := service.GetAllStoreHouseConfig(adminUser.CurrentOrgId)
+				//stockList, _ := service.GetStockCountByGoodId(goods.GoodId, storeHouseConfig.StorehouseOutInfo,adminUser.CurrentOrgId)
+				//var total_count int64
+				//for _, it := range stockList {
+				//  total_count += it.StockCount
+				//}
+				////基础库插入数据
+				//service.UpdateGoodInfoReduceSumCount(goods.GoodId, total_count, adminUser.CurrentOrgId)
+				//
+				//////更新剩余库存
+				//
+				//goodList, _ := service.GetSumGoodList(adminUser.CurrentOrgId, storeHouseConfig.StorehouseOutInfo, goods.GoodId)
+				//var flush_count int64
+				//for _, it := range goodList {
+				//  flush_count += it.StockCount
+				//}
+				//errs := service.UpdateSumGood(adminUser.CurrentOrgId, storeHouseConfig.StorehouseOutInfo, goods.GoodId, flush_count)
+				//fmt.Println(errs)
 			}
-			service.ConsumablesDeliveryTotal(adminUser.CurrentOrgId, his.PatientId, his.RecordDate, goods, newGoods, adminUser.AdminUser.Id)
 
 			c.ServeSuccessJSON(map[string]interface{}{
 				"msg": "结算成功",
@@ -5438,12 +5671,14 @@ 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
-
+				var hisAdvice []*models.HisDoctorAdviceInfo
+				var newGoodOne []*models.NewDialysisBeforePrepareGoods
+				var infolist []*models.HisDoctorAdviceInfo
+				var oldGoods []*models.OldDialysisBeforePrepareGoods
 				for _, info := range prescriptions {
 					if info.Type == 1 {
 						infos = append(infos, info.HisDoctorAdviceInfo...)
@@ -5474,11 +5709,161 @@ func (c *HisApiController) GetUploadInfo() {
 
 					}
 				}
-				for _, item := range infos {
-					service.HisDrugsDelivery(item.UserOrgId, adminUser.AdminUser.Id, item)
 
+				settConfig, _ := service.GetSettleOpenConfigByOrgId(adminUser.CurrentOrgId)
+				if settConfig.IsOpen == 1 {
+
+					//判断库存的地方
+					for _, info := range prescriptions {
+						if info.Type == 1 {
+							infolist = append(infolist, info.HisDoctorAdviceInfo...)
+
+						}
+						if info.Type == 2 {
+							for _, sumItem := range info.HisPrescriptionProject {
+								if sumItem.Type == 3 {
+									var good models.DialysisBeforePrepareGoods
+									var newGood models.NewDialysisBeforePrepareGoods
+									var oldGood models.OldDialysisBeforePrepareGoods
+									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)
+
+									oldGood.GoodId = sumItem.GoodInfo.ID
+									oldGood.GoodTypeId = sumItem.GoodInfo.GoodTypeId
+									count3, _ := strconv.Atoi(sumItem.Count)
+									oldGood.Count = int64(count3)
+									oldGood.StorehouseId = houseConfig.StorehouseOutInfo
+									oldGood.ProjectId = sumItem.ID
+									oldGood.RecordDate = sumItem.RecordDate
+
+									oldGoods = append(oldGoods, &oldGood)
+								}
+							}
+						}
+					}
+
+					for _, info := range prescriptionsOne {
+						if info.Type == 1 {
+							hisAdvice = append(hisAdvice, info.HisDoctorAdviceInfo...)
+						}
+
+						if info.Type == 2 {
+							for _, sumItem := range info.HisPrescriptionProject {
+								if sumItem.Type == 3 {
+									var newGood models.NewDialysisBeforePrepareGoods
+
+									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
+									newGoodOne = append(newGoodOne, &newGood)
+								}
+							}
+						}
+					}
+
+					//判断
+					for _, itemOne := range infos {
+						for _, itemTwo := range hisAdvice {
+							if itemOne.DrugId == itemTwo.DrugId {
+								itemTwo.Child = append(itemTwo.ChildDoctorAdvice, itemOne)
+							}
+						}
+					}
+
+					for _, itemTwo := range hisAdvice {
+						medical, _ := service.GetBaseDrugMedical(itemTwo.DrugId)
+						var sum_out_count int64
+						for _, itemThree := range itemTwo.Child {
+							var prescribing_number int64
+							stringPrescribingNumber := strconv.FormatFloat(itemThree.PrescribingNumber, 'f', -1, 64)
+							parseIntPrescribingNumber, _ := strconv.ParseInt(stringPrescribingNumber, 10, 64)
+							if itemThree.PrescribingNumberUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
+								prescribing_number = parseIntPrescribingNumber * medical.MinNumber
+							}
+							if itemThree.PrescribingNumberUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
+								prescribing_number = parseIntPrescribingNumber
+							}
+							if itemThree.PrescribingNumberUnit == medical.MinUnit && medical.MaxUnit == medical.MinUnit {
+								prescribing_number = parseIntPrescribingNumber
+							}
+							sum_out_count += prescribing_number
+						}
+						drugStockOut, _ := service.GetDrugSumOutCountByDrugId(itemTwo.DrugId, adminUser.CurrentOrgId)
+
+						if sum_out_count > drugStockOut.FlushCount {
+							c.ServeSuccessJSON(map[string]interface{}{
+								"msg":  "2",
+								"drug": medical,
+							})
+							return
+						}
+					}
+
+					for _, itemOne := range newGoods {
+						for _, item := range newGoodOne {
+							if itemOne.ProjectId == item.ProjectId {
+								item.ChildNewDialysisBeforePrepareGoods = append(item.ChildNewDialysisBeforePrepareGoods, item)
+							}
+						}
+					}
+
+					for _, item := range newGoodOne {
+						var sum_out_count_one int64
+						good, _ := service.GetGoodInformationByGoodIdOne(item.GoodId)
+
+						for _, itemOne := range item.ChildNewDialysisBeforePrepareGoods {
+							sum_out_count_one += itemOne.Count
+						}
+						list, _ := service.GetStockGoodList(item.GoodId, adminUser.CurrentOrgId)
+						fmt.Println("sum_out_count_one", sum_out_count_one)
+						fmt.Println("list.FlushCount", list.FlushCount)
+						if sum_out_count_one > list.FlushCount {
+							c.ServeSuccessJSON(map[string]interface{}{
+								"msg":  "3",
+								"good": good,
+							})
+							return
+						}
+					}
+
+					fmt.Println("infos233232323223323232323232323232", infolist)
+					for _, item := range infolist {
+						service.HisDrugsDelivery(item.UserOrgId, adminUser.AdminUser.Id, item)
+					}
+					for _, item := range oldGoods {
+						dialyPrepareOne := models.DialysisBeforePrepare{
+							GoodTypeId:   item.GoodTypeId,
+							GoodId:       item.GoodId,
+							PatientId:    item.PatientId,
+							RecordDate:   item.RecordDate,
+							UserOrgId:    item.UserOrgId,
+							Count:        item.Count,
+							Ctime:        time.Now().Unix(),
+							Creater:      adminUser.AdminUser.Id,
+							CommdityCode: item.CommdityCode,
+							Status:       1,
+							StorehouseId: houseConfig.StorehouseOutInfo,
+						}
+						err = service.CreateDialysisBeforePrepareOne(&dialyPrepareOne)
+					}
+					service.ConsumablesDeliveryTotal(adminUser.CurrentOrgId, his.PatientId, his.RecordDate, goods, newGoods, adminUser.AdminUser.Id)
 				}
-				service.ConsumablesDeliveryTotal(adminUser.CurrentOrgId, his.PatientId, his.RecordDate, goods, newGoods, adminUser.AdminUser.Id)
 
 				c.ServeSuccessJSON(map[string]interface{}{
 					"msg": "结算成功",
@@ -5509,10 +5894,6 @@ func (c *HisApiController) Refund() {
 		}
 	}
 
-	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
@@ -5533,6 +5914,7 @@ func (c *HisApiController) Refund() {
 				good.Count = int64(count)
 				good.StorehouseId = houseConfig.StorehouseOutInfo
 				good.ProjectId = info.HisPrescriptionProject.ID
+
 				goods = append(goods, &good)
 
 				newGood.GoodId = info.HisPrescriptionProject.VMGoodInfo.ID
@@ -5541,12 +5923,23 @@ func (c *HisApiController) Refund() {
 				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)
 			}
 		}
 	}
-	for _, item := range infos {
-		service.DrugAutoAddCancelInfo(item, order.Creator)
+	settConfig, _ := service.GetSettleOpenConfigByOrgId(adminUser.CurrentOrgId)
+	if settConfig.IsOpen == 1 {
+		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{}{

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -269,7 +269,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 
 	template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 
-	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 || template.TemplateId == 32 || template.TemplateId == 36 || template.TemplateId == 40 || template.TemplateId == 38 || template.TemplateId == 43 || template.TemplateId == 46 || template.TemplateId == 53 || template.TemplateId == 48 || adminUserInfo.Org.Id == 10345 {
+	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 || template.TemplateId == 32 || template.TemplateId == 36 || template.TemplateId == 40 || template.TemplateId == 38 || template.TemplateId == 43 || template.TemplateId == 46 || template.TemplateId == 53 || template.TemplateId == 48 || adminUserInfo.Org.Id == 10345 || adminUserInfo.Org.Id == 10432 {
 		dewater_amount = dewater_amount * 1000
 	}
 
@@ -379,6 +379,9 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 			newprescribe.Remark = dialysisSolution.Remark
 			if adminUserInfo.Org.Id == 10340 {
 				newprescribe.TargetUltrafiltration = 0
+				newprescribe.Sodium = 138
+				newprescribe.Bicarbonate = 31.1
+				newprescribe.DialysateFlow = 500
 			}
 			//插入透析处方
 			err := service.AddSigleRecord(&newprescribe)
@@ -659,6 +662,9 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				if adminUserInfo.Org.Id == 10318 {
 					evaluation.Remark = "患者已确认无发热，无流行病学接触史"
 				}
+				if adminUserInfo.Org.Id == 10340 {
+					evaluation.BreathingRate = "20"
+				}
 			}
 		} else {
 			evaluation.UpdatedTime = time.Now().Unix()

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -88,7 +88,7 @@ func (this *DialysisAPIController) Scheduals() {
 
 	key := "scheduals_" + schedualDate + "_" + strconv.FormatInt(orgID, 10)
 	scheduals_json_str, _ := redis.Get(key).Result()
-	redis.Set(scheduals_json_str, "", time.Second)
+	redis.Set(key, "", time.Second)
 	patients, _ := service.GetAllPatientListSix(orgID)
 	if len(scheduals_json_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		scheduals, err := service.MobileGetDialysisScheduals(orgID, date.Unix(), schedualType)
@@ -105,8 +105,8 @@ func (this *DialysisAPIController) Scheduals() {
 				dialysisOrders, _ := service.GetAllDialysisOrdersByList(orgID, date.Unix())
 				treatmentSummarys, _ := service.GetAllTreatmentSummarysByList(orgID, date.Unix())
 				AssessmentAfterDislysis, _ := service.GetAllAssessmentAfterDislysisByList(orgID, date.Unix())
+				dobulecheck, _ := service.GetAllDobuleCheckList(orgID, date.Unix())
 				hisAdvices, _ := service.GetAllHisAdvicesByList(orgID, date.Unix())
-
 				for key, item := range scheduals {
 					// 获取患者信息
 					for _, patient := range patients {
@@ -178,6 +178,13 @@ func (this *DialysisAPIController) Scheduals() {
 							break
 						}
 					}
+
+					for _, check := range dobulecheck {
+						if item.PatientId == check.PatientId {
+							scheduals[key].DoubleCheck = check
+							break
+						}
+					}
 				}
 				//缓存数据
 				scheduals_json, err := json.Marshal(&scheduals)
@@ -194,6 +201,8 @@ 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,
@@ -554,7 +563,6 @@ func (this *DialysisAPIController) DialysisRecord() {
 	if is_advice_open.IsAdviceOpen == 1 {
 		his_advices, _ = service.GetAllHisDoctorAdvice(adminInfo.Org.Id, patientID, date.Unix())
 	}
-	fmt.Println("doctorAdvices23344334344433434334343434wode", doctorAdvices)
 
 	lastOrder, _ := service.GetLastDilysisOrder(adminInfo.Org.Id, patientID, date.Unix())
 	returnData := map[string]interface{}{
@@ -739,15 +747,6 @@ func (c *DialysisAPIController) PostDoubleCheck() {
 		return
 	}
 
-	if adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 9675 || adminUserInfo.Org.Id == 10340 {
-
-		list, _ := service.GetRoleList(adminUserInfo.Org.Id, modifier)
-		if employee_number != list.JobNumber {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorEmployeeNumber)
-			return
-		}
-	}
-
 	if len(recordDateStr) == 0 {
 		recordDateStr = time.Now().Format("2006-01-02")
 	}
@@ -776,10 +775,31 @@ func (c *DialysisAPIController) PostDoubleCheck() {
 		firstCheckDateUnix, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", firstCheckTimeStr)
 		firstCheckDate = firstCheckDateUnix.Unix()
 	}
-	//now := time.Now()
-	//year, month, day := now.Date()
-	//today_time := time.Date(year, month, day, 0, 0, 0, 0, time.Local)
-	//todayTimeStamp := today_time.Unix()
+
+	if adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 9675 || adminUserInfo.Org.Id == 10340 {
+
+		list, _ := service.GetRoleList(adminUserInfo.Org.Id, modifier)
+		_, check := service.FindDoubleCheckByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
+		if check.ID == 0 {
+			if employee_number != list.JobNumber {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"doubleCheck": check,
+					"msg":         "2",
+				})
+				return
+			}
+		}
+		if check.ID > 0 {
+			if employee_number != list.JobNumber {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"doubleCheck": check,
+					"msg":         "2",
+				})
+				return
+			}
+		}
+
+	}
 
 	doubleCheck := models.DoubleCheck{
 		UserOrgId:                  adminUserInfo.Org.Id,
@@ -837,6 +857,7 @@ func (c *DialysisAPIController) PostDoubleCheck() {
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"doubleCheck": &doubleCheck,
+				"msg":         "1",
 			})
 		}
 
@@ -1107,6 +1128,7 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 		Complication:                 complications,
 		DialysisIntakes:              dialysateVolume,
 		CreatedTime:                  time.Now().Unix(),
+		UpdatedTime:                  time.Now().Unix(),
 		Status:                       1,
 		Remark:                       remark,
 		BloodAccessPartId:            blood_access_part_id,
@@ -1361,6 +1383,8 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 	dry_water_hour := c.GetString("dry_water_hour")
 
 	water_machine := c.GetString("water_machine")
+	add_amount, _ := c.GetFloat("add_amount")
+	reduce_amount, _ := c.GetFloat("reduce_amount")
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
 
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
@@ -1471,6 +1495,8 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		DrhyWater:                  drhy_water,
 		DryWaterHour:               dry_water_hour,
 		WaterMachine:               water_machine,
+		AddAmount:                  add_amount,
+		ReduceAmount:               reduce_amount,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -1821,7 +1847,7 @@ func (c *DialysisAPIController) Finish() {
 
 	}
 
-	if adminUserInfo.Org.Id == 10101 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 9675 || adminUserInfo.Org.Id == 10215 || adminUserInfo.Org.Id == 10233 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 10243 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 10414 || adminUserInfo.Org.Id == 10430 {
+	if adminUserInfo.Org.Id == 10101 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 9675 || adminUserInfo.Org.Id == 10215 || adminUserInfo.Org.Id == 10233 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 10243 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 10414 || adminUserInfo.Org.Id == 10430 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10223 {
 		evaluation, _ := service.MobileGetPredialysisEvaluationOne(adminUserInfo.Org.Id, id, recordDate.Unix())
 		if evaluation.SystolicBloodPressure == 0 {
 			evaluation.SystolicBloodPressure = fmonitorRecords.SystolicBloodPressure
@@ -2103,7 +2129,8 @@ func (this *DialysisAPIController) StartDialysis() {
 	zone_id, _ := this.GetInt64("zone_id")
 	elecsign := this.GetString("url")
 	nuclein_date_str := this.GetString("nuclein_date_str")
-
+	schedule_remark := this.GetString("schedule_remark")
+	order_remark := this.GetString("order_remark")
 	if patientID <= 0 || len(recordDateStr) == 0 || nurseID <= 0 || bedID <= 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -2186,7 +2213,7 @@ func (this *DialysisAPIController) StartDialysis() {
 		}
 		theNucleinDate = theTime.Unix()
 	}
-	fmt.Println("wo2o3o23o2o2323oo232o3swo", theNucleinDate)
+
 	template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 
 	//查询更改的机号，是否有人用了,如果只是排班了，但是没上机，直接替换，如果排班且上机了，就提示他无法上机
@@ -2303,13 +2330,15 @@ func (this *DialysisAPIController) StartDialysis() {
 		BloodAccessId:          blood_access_id,
 		Url:                    elecsign,
 		NucleinDate:            theNucleinDate,
+		ScheduleRemark:         schedule_remark,
+		OrderRemark:            order_remark,
 	}
 	//查询该床位是否有人用了
 	_, errorscode := service.GetDialysisOrderByBedId(adminUserInfo.Org.Id, schedulestartTime, bedID, schedual_type)
 	if errorscode == gorm.ErrRecordNotFound {
 
 		createErr := service.MobileCreateDialysisOrder(adminUserInfo.Org.Id, patientID, dialysisRecord)
-
+		service.UpdateMobilePatient(adminUserInfo.Org.Id, patientID, schedule_remark)
 		redis := service.RedisClient()
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":dialysis_order"
 		redis.Set(key, "", time.Second)
@@ -2372,7 +2401,7 @@ func (this *DialysisAPIController) StartDialysis() {
 
 			//针对肇庆三鹤血液透析中心
 
-			if template.TemplateId == 43 {
+			if template.TemplateId == 43 || adminUserInfo.Org.Id == 10432 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / float64(totalMin))
 			}
 
@@ -2405,9 +2434,10 @@ 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 {
+	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 {
 		// 查询病人是否有透前评估数据
 		befor, errcode := service.GetAssessmentBefor(adminUserInfo.Org.Id, patientID, recordDate.Unix())
+
 		//如果有数据就插入
 		if errcode == nil {
 			record.SystolicBloodPressure = befor.SystolicBloodPressure
@@ -2430,7 +2460,17 @@ func (this *DialysisAPIController) StartDialysis() {
 			record.VenousPressure = 80
 			record.TransmembranePressure = 60
 		}
+		//针对兰溪人民医院的需求
+		if adminUserInfo.Org.Id == 10430 || adminUserInfo.Org.Id == 9671 {
+			befor, _ := service.GetAssessmentBeforThrity(adminUserInfo.Org.Id, patientID, recordDate.Unix())
+			record.SystolicBloodPressure = befor.SystolicBloodPressure
+			record.DiastolicBloodPressure = befor.DiastolicBloodPressure
+			record.Temperature = befor.Temperature
+			record.PulseFrequency = befor.PulseFrequency
+			record.BreathingRate = befor.BreathingRate
+		}
 		err := service.CreateMonitor(&record)
+
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":monitor_records"
 
 		redis := service.RedisClient()
@@ -2578,6 +2618,8 @@ func (c *DialysisAPIController) PostSolution() {
 	admin_user_id, _ := c.GetInt64("admin_user_id")
 
 	is_water := c.GetString("is_water")
+	add_amount, _ := c.GetFloat("add_amount")
+	reduce_amount, _ := c.GetFloat("reduce_amount")
 	var is_war int64
 	if is_water == "是" {
 		is_war = 1
@@ -2702,6 +2744,8 @@ func (c *DialysisAPIController) PostSolution() {
 		DrhyWater:                  drhy_water,
 		DryWaterHour:               dry_water_hour,
 		WaterMachine:               water_machine,
+		AddAmount:                  add_amount,
+		ReduceAmount:               reduce_amount,
 	}
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
@@ -2799,6 +2843,7 @@ func (c *DialysisAPIController) PostSolution() {
 		EpoCount:                   epo_count,
 		MaxUltrafiltrationRate:     max_ultrafiltration_rate,
 		PreImpulse:                 impulse,
+		SolutionStatus:             1,
 	}
 
 	//针对河间咸的
@@ -3028,9 +3073,8 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 
-			if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10340 {
+			if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10340 || adminInfo.Org.Id == 10432 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / 1000 / float64(totalMin) * 1000)
-				fmt.Println("ultrafiltration_rate2332323223322332q", ultrafiltration_rate)
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 			//if template.TemplateId == 47 {
@@ -3058,7 +3102,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		}
 	}
 
-	if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10340 {
+	if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10340 || adminInfo.Org.Id == 10432 {
 
 		if ultrafiltration_rate > 0 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
@@ -3098,6 +3142,8 @@ func (this *DialysisAPIController) ModifyStartDialysisOrder() {
 	dialysis_irrigation := this.GetString("dialysis_irrigation")
 	blood_access_id, _ := this.GetInt64("blood_access_id")
 	nuclein_date_str := this.GetString("nuclein_date_str")
+	order_remark := this.GetString("order_remark")
+	schedule_remark := this.GetString("schedule_remark")
 	if record_id == 0 {
 		this.ErrorLog("id:%v", record_id)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -3260,9 +3306,13 @@ func (this *DialysisAPIController) ModifyStartDialysisOrder() {
 		DialysisIrrigation:     dialysis_irrigation,
 		BloodAccessId:          blood_access_id,
 		NucleinDate:            theNucleinDate,
+		OrderRemark:            order_remark,
+		ScheduleRemark:         schedule_remark,
 	}
 
 	updateErr := service.ModifyStartDialysisOrder(dialysisRecord)
+	order, _ := service.GetLastPatientOrder(record_id)
+	service.UpdateMobilePatient(adminUserInfo.Org.Id, order.PatientId, schedule_remark)
 	redis := service.RedisClient()
 
 	key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(record_date, 10) + ":dialysis_order"
@@ -3767,7 +3817,7 @@ func (c *DialysisAPIController) CreateRemindDoctorAdvice() {
 		advice.UserOrgId = adminUserInfo.Org.Id
 		advice.PatientId = patient
 		advice.AdviceDoctor = adminUserInfo.AdminUser.Id
-
+		advice.IsSettle = 2
 		if adviceNameM["advice_name"] == nil || reflect.TypeOf(adviceNameM["advice_name"]).String() != "string" {
 			utils.ErrorLog("advice_name")
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -3894,7 +3944,7 @@ func (c *DialysisAPIController) CreateRemindDoctorAdvice() {
 					child.UserOrgId = adminUserInfo.Org.Id
 					child.PatientId = patient
 					child.AdviceDoctor = adminUserInfo.AdminUser.Id
-
+					child.IsSettle = 1
 					if childMap["advice_name"] == nil || reflect.TypeOf(childMap["advice_name"]).String() != "string" {
 						utils.ErrorLog("child advice_name")
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -4084,15 +4134,16 @@ func (c *DialysisAPIController) GetSolution() {
 	solution, err := service.MobileGetDialysisSolutionByModeIdSeven(adminUserInfo.Org.Id, patient_id, mode_id)
 	prescription, err := service.MobileGetLastDialysisPrescribeByModeIdSeven(adminUserInfo.Org.Id, patient_id, mode_id)
 	system_prescription, err := service.MobileGetSystemDialysisPrescribeByModeIdSeven(adminUserInfo.Org.Id, mode_id)
-
+	dialysisPrescription, _ := service.MobileGetLastDialysisPrescription(patient_id, adminUserInfo.Org.Id)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 	}
 	c.ServeSuccessJSON(map[string]interface{}{
-		"solution":            solution,
-		"prescription":        prescription,
-		"system_prescription": system_prescription,
+		"solution":             solution,
+		"prescription":         prescription,
+		"system_prescription":  system_prescription,
+		"dialysisPrescription": dialysisPrescription,
 	})
 
 }
@@ -6978,6 +7029,502 @@ func (this *DialysisAPIController) GetDialysisRecordOrder() {
 	})
 }
 
+func (this *DialysisAPIController) GetScheduleTypeByIdList() {
+
+	org_id := this.GetMobileAdminUserInfo().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
+
+	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()
+	}
+
+	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,
+	})
+}
+
+func (this *DialysisAPIController) SavePatientPicture() {
+
+	patient_id, _ := this.GetInt64("patient_id")
+	dialysis_date, _ := this.GetInt64("schedule_date")
+	avatar := this.GetString("avatar")
+	fmt.Println("patient_id", patient_id)
+	orgId := this.GetMobileAdminUserInfo().Org.Id
+
+	order := models.DialysisOrder{
+		Url: avatar,
+	}
+	err := service.UpdatePatientSign(patient_id, dialysis_date, order, orgId)
+	redis := service.RedisClient()
+
+	key := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(dialysis_date, 10) + ":dialysis_order"
+	redis.Set(key, "", time.Second)
+	keyOne := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(dialysis_date, 10) + ":dialysis_orders_list_all"
+	//清空key 值
+	redis.Set(keyOne, "", time.Second)
+	keyThree := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(dialysis_date, 10) + ":doctor_advices"
+	redis.Set(keyThree, "", time.Second)
+	keyFour := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(dialysis_date, 10) + ":monitor_records"
+	redis.Set(keyFour, "", time.Second)
+
+	keyFive := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":patient_info"
+	redis.Set(keyFive, "", time.Second)
+
+	keySix := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(dialysis_date, 10) + ":his_doctor_advice"
+	redis.Set(keySix, "", time.Second)
+
+	keySeven := strconv.FormatInt(orgId, 10) + ":" + ":device_list_all"
+	redis.Set(keySeven, "", time.Second)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBUpdate)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"order": order,
+	})
+}
+
+func (this *DialysisAPIController) ExectionMobileAdvice() {
+
+	ids := this.GetString("ids")
+	idSplit := strings.Split(ids, ",")
+	orgId := this.GetMobileAdminUserInfo().Org.Id
+
+	config, _ := service.FindXTHisRecordByOrgIdSix(orgId)
+	execution_time := this.GetString("exce_time")
+	timeLayout2 := "2006-01-02 15:04:05"
+	loc, _ := time.LoadLocation("Local")
+
+	theTime, errs := time.ParseInLocation(timeLayout2, execution_time, loc)
+	if errs != nil {
+		utils.ErrorLog(errs.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	//his客户
+	if config.IsOpen == 1 {
+
+		list, _ := service.GetHisMobileAdviceGroupList(orgId, idSplit)
+		adviceList, _ := service.GetHisMobileAdviceList(orgId, idSplit)
+		for _, item := range list {
+			for _, it := range adviceList {
+				if item.DrugId == it.DrugId {
+					item.ChildDoctorAdvice = append(item.ChildDoctorAdvice, it)
+				}
+			}
+		}
+
+		for _, item := range list {
+			medical, _ := service.GetBaseDrugMedical(item.DrugId)
+			var sum_out_count int64
+			for _, itemThree := range item.ChildDoctorAdvice {
+				var prescribing_number int64
+				stringPrescribingNumber := strconv.FormatFloat(itemThree.PrescribingNumber, 'f', -1, 64)
+				parseIntPrescribingNumber, _ := strconv.ParseInt(stringPrescribingNumber, 10, 64)
+				if itemThree.PrescribingNumberUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
+					prescribing_number = parseIntPrescribingNumber * medical.MinNumber
+				}
+				if itemThree.PrescribingNumberUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
+					prescribing_number = parseIntPrescribingNumber
+				}
+				if itemThree.PrescribingNumberUnit == medical.MinUnit && medical.MaxUnit == medical.MinUnit {
+					prescribing_number = parseIntPrescribingNumber
+				}
+				sum_out_count += prescribing_number
+			}
+			drugStockOut, _ := service.GetDrugSumOutCountByDrugId(item.DrugId, orgId)
+
+			//库存不足
+			if sum_out_count > drugStockOut.FlushCount {
+				this.ServeSuccessJSON(map[string]interface{}{
+					"msg":  "2",
+					"drug": medical,
+					"ids":  ids,
+				})
+				return
+			}
+		}
+		creater := this.GetMobileAdminUserInfo().AdminUser.Id
+		//执行医嘱
+		errs := service.ExectionMobileAdvice(orgId, idSplit, theTime.Unix(), creater)
+		advices, _ := service.FindHisDoctorAdviceByIds(orgId, idSplit)
+		for _, item := range advices {
+			key := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":doctor_advices"
+			redis := service.RedisClient()
+			//清空key 值
+			redis.Set(key, "", time.Second)
+			keyTwo := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":advice_list_all"
+			redis.Set(keyTwo, "", time.Second)
+			keyThree := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":his_doctor_advice"
+			redis.Set(keyThree, "", time.Second)
+			recordDate := theTime.Format("2006-01-02")
+			keyFour := "scheduals_" + recordDate + "_" + strconv.FormatInt(orgId, 10)
+
+			redis.Set(keyFour, "", time.Second)
+			keyFive := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":his_advices_list_all"
+			redis.Set(keyFive, "", time.Second)
+
+			defer redis.Close()
+		}
+		if errs == nil {
+
+			//药品管理信息
+			_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(orgId)
+			storeHouseConfig, _ := service.GetAllStoreHouseConfig(orgId)
+			if drugStockConfig.IsOpen == 1 {
+				for _, item := range advices {
+					advice, _ := service.FindHisDoctorAdviceById(orgId, item.ID)
+					config, _ := service.GetDrugOpenConfigOne(orgId)
+					if config.IsOpen != 1 {
+						//查询该药品是否有库存
+						medical, _ := service.GetBaseDrugMedical(item.DrugId)
+						pharmacyConfig, _ := service.FindPharmacyConfig(advice.UserOrgId)
+						if medical.IsUse == 2 {
+							if config.IsOpen != 1 {
+								if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
+									service.HisDrugsDelivery(orgId, creater, &advice)
+								}
+								if pharmacyConfig.IsOpen != 1 {
+									service.HisDrugsDelivery(orgId, creater, &advice)
+								}
+
+								//更新字典里面的库存
+								stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+								var sum_count int64
+								for _, its := range stockInfo {
+									if its.MaxUnit == medical.MaxUnit {
+										its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+									}
+									sum_count += its.StockMaxNumber + its.StockMinNumber
+								}
+								service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
+								//剩余库存
+								service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
+							}
+
+						}
+
+					}
+				}
+			}
+			this.ServeSuccessJSON(map[string]interface{}{
+				"msg": "1",
+				"ids": ids,
+			})
+			return
+		} else {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		}
+	}
+
+	fmt.Println("config233322333223", config.IsOpen)
+
+	//血透客户
+	if config.IsOpen == 2 || config.IsOpen == 0 {
+
+		//药品管理信息
+		_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(orgId)
+		if drugStockConfig.IsOpen == 1 {
+			list, _ := service.GetBloodMobileAdviceGroupList(orgId, idSplit)
+			adviceList, _ := service.GetBloodMobileAdviceList(orgId, idSplit)
+			for _, item := range list {
+				for _, it := range adviceList {
+					if item.DrugId == it.DrugId {
+						item.ChildDoctorAdvice = append(item.ChildDoctorAdvice, it)
+					}
+				}
+			}
+			for _, item := range list {
+				medical, _ := service.GetBaseDrugMedical(item.DrugId)
+				var sum_out_count int64
+				for _, itemThree := range item.ChildDoctorAdvice {
+					var prescribing_number int64
+					stringPrescribingNumber := strconv.FormatFloat(itemThree.PrescribingNumber, 'f', -1, 64)
+					parseIntPrescribingNumber, _ := strconv.ParseInt(stringPrescribingNumber, 10, 64)
+					if itemThree.PrescribingNumberUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
+						prescribing_number = parseIntPrescribingNumber * medical.MinNumber
+					}
+					if itemThree.PrescribingNumberUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
+						prescribing_number = parseIntPrescribingNumber
+					}
+					if itemThree.PrescribingNumberUnit == medical.MinUnit && medical.MaxUnit == medical.MinUnit {
+						prescribing_number = parseIntPrescribingNumber
+					}
+					sum_out_count += prescribing_number
+				}
+				drugStockOut, _ := service.GetDrugSumOutCountByDrugId(item.DrugId, orgId)
+
+				//库存不足
+				if sum_out_count > drugStockOut.FlushCount {
+					this.ServeSuccessJSON(map[string]interface{}{
+						"msg":  "2",
+						"drug": medical,
+						"ids":  ids,
+					})
+					return
+				}
+			}
+
+			creater := this.GetMobileAdminUserInfo().AdminUser.Id
+			fmt.Println("creater2332243244224242424", creater)
+			//执行医嘱
+			errs := service.ExectionBloodMobileAdvice(orgId, idSplit, theTime.Unix(), creater)
+			advices, _ := service.FindAllDoctorAdviceByIds(orgId, idSplit)
+			for _, item := range advices {
+				key := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":doctor_advices"
+				redis := service.RedisClient()
+				//清空key 值
+				redis.Set(key, "", time.Second)
+				keyTwo := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":advice_list_all"
+				redis.Set(keyTwo, "", time.Second)
+				keyThree := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":his_doctor_advice"
+				redis.Set(keyThree, "", time.Second)
+				recordDate := theTime.Format("2006-01-02")
+				keyFour := "scheduals_" + recordDate + "_" + strconv.FormatInt(orgId, 10)
+
+				redis.Set(keyFour, "", time.Second)
+				keyFive := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":his_advices_list_all"
+				redis.Set(keyFive, "", time.Second)
+
+				defer redis.Close()
+			}
+			if errs == nil {
+
+				for _, item := range advices {
+					storeHouseConfig, _ := service.GetAllStoreHouseConfig(orgId)
+					medical, _ := service.GetBaseDrugMedical(item.DrugId)
+					//查询是否出库按钮开启
+					adviceSetting, _ := service.FindAdviceSettingById(item.UserOrgId)
+					if adviceSetting.IsAdviceOpen == 1 {
+						//查询是否出库按钮开启
+						prescriptionConfig, _ := service.FindPrescriptionConfigById(item.UserOrgId)
+						pharmacyConfig, _ := service.FindPharmacyConfig(item.UserOrgId)
+						if prescriptionConfig.IsOpen == 1 {
+							if medical.IsUse == 2 {
+								if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
+									service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+								}
+								if pharmacyConfig.IsOpen != 1 {
+									service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+								}
+
+								//更新字典里面的库存
+								stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+								var sum_count int64
+								for _, its := range stockInfo {
+									if its.MaxUnit == medical.MaxUnit {
+										its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+									}
+									sum_count += its.StockMaxNumber + its.StockMinNumber
+								}
+								service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
+								//剩余库存
+								service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
+							}
+						}
+					} else {
+						pharmacyConfig, _ := service.FindPharmacyConfig(item.UserOrgId)
+						if medical.IsUse == 2 {
+							if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
+								service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+							}
+							if pharmacyConfig.IsOpen != 1 {
+								service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+							}
+
+							stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+							var sum_count int64
+							for _, its := range stockInfo {
+								if its.MaxUnit == medical.MaxUnit {
+									its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+								}
+								sum_count += its.StockMaxNumber + its.StockMinNumber
+							}
+							service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
+							//剩余库存
+							service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
+						}
+					}
+				}
+			}
+			this.ServeSuccessJSON(map[string]interface{}{
+				"msg": "1",
+				"ids": ids,
+			})
+			return
+
+		} else {
+
+			creater := this.GetMobileAdminUserInfo().AdminUser.Id
+			//执行医嘱
+			service.ExectionBloodMobileAdvice(orgId, idSplit, theTime.Unix(), creater)
+			advices, _ := service.FindAllDoctorAdviceByIds(orgId, idSplit)
+			for _, item := range advices {
+				key := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":doctor_advices"
+				redis := service.RedisClient()
+				//清空key 值
+				redis.Set(key, "", time.Second)
+				keyTwo := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":advice_list_all"
+				redis.Set(keyTwo, "", time.Second)
+				keyThree := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":his_doctor_advice"
+				redis.Set(keyThree, "", time.Second)
+				recordDate := theTime.Format("2006-01-02")
+				keyFour := "scheduals_" + recordDate + "_" + strconv.FormatInt(orgId, 10)
+
+				redis.Set(keyFour, "", time.Second)
+				keyFive := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":his_advices_list_all"
+				redis.Set(keyFive, "", time.Second)
+
+				defer redis.Close()
+			}
+			this.ServeSuccessJSON(map[string]interface{}{
+				"msg": "1",
+				"ids": ids,
+			})
+			return
+		}
+
+	}
+
+}
+
+func (this *DialysisAPIController) GetSettleMobileAdvice() {
+
+	ids := this.GetString("ids")
+	idSplit := strings.Split(ids, ",")
+	orgId := this.GetMobileAdminUserInfo().Org.Id
+	config, _ := service.FindXTHisRecordByOrgIdSix(orgId)
+
+	if config.IsOpen == 1 {
+		service.UpdateSettleMobileHisAdvice(orgId, idSplit)
+		this.ServeSuccessJSON(map[string]interface{}{
+			"msg": "1",
+			"ids": ids,
+		})
+		return
+	}
+
+	if config.IsOpen == 0 || config.IsOpen == 2 {
+
+		service.UpdateSettleMobileBloodAdvice(orgId, idSplit)
+		this.ServeSuccessJSON(map[string]interface{}{
+			"msg": "1",
+			"ids": ids,
+		})
+		return
+	}
+}
+
+func (this *DialysisAPIController) GetCheckMobileAdvice() {
+
+	ids := this.GetString("ids")
+	idSplit := strings.Split(ids, ",")
+	orgId := this.GetMobileAdminUserInfo().Org.Id
+
+	config, _ := service.FindXTHisRecordByOrgIdSix(orgId)
+
+	//his
+	if config.IsOpen == 1 {
+		checker := this.GetMobileAdminUserInfo().AdminUser.Id
+		theTime := time.Now()
+
+		advices := models.HisDoctorAdviceThirty{
+			CheckTime:   theTime.Unix(),
+			Checker:     checker,
+			UpdatedTime: time.Now().Unix(),
+		}
+		service.CheckHisMobileDoctorAdvice(orgId, idSplit, advices)
+
+		list, _ := service.FindDoctorAdviceByIds(orgId, idSplit)
+		for _, item := range list {
+			key := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":doctor_advices"
+			redis := service.RedisClient()
+			//清空key 值
+			redis.Set(key, "", time.Second)
+			keyTwo := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":advice_list_all"
+			redis.Set(keyTwo, "", time.Second)
+			keyThree := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":his_doctor_advice"
+			redis.Set(keyThree, "", time.Second)
+			recordDate := theTime.Format("2006-01-02")
+			keyFour := "scheduals_" + recordDate + "_" + strconv.FormatInt(orgId, 10)
+
+			redis.Set(keyFour, "", time.Second)
+			keyFive := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":his_advices_list_all"
+			redis.Set(keyFive, "", time.Second)
+			defer redis.Close()
+		}
+
+		this.ServeSuccessJSON(map[string]interface{}{
+			"msg": "1",
+			"ids": ids,
+		})
+		return
+	}
+
+	//血透
+	if config.IsOpen == 0 || config.IsOpen == 2 {
+
+		checker := this.GetMobileAdminUserInfo().AdminUser.Id
+		theTime := time.Now()
+
+		advices := models.DoctorAdvice{
+			CheckTime:   theTime.Unix(),
+			Checker:     checker,
+			UpdatedTime: time.Now().Unix(),
+		}
+
+		service.CheckBloodDoctorAdvice(orgId, idSplit, advices)
+		list, _ := service.FindDoctorAdviceByIds(orgId, idSplit)
+		for _, item := range list {
+			key := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":doctor_advices"
+			redis := service.RedisClient()
+			//清空key 值
+			redis.Set(key, "", time.Second)
+			keyTwo := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":advice_list_all"
+			redis.Set(keyTwo, "", time.Second)
+			keyThree := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":his_doctor_advice"
+			redis.Set(keyThree, "", time.Second)
+			recordDate := theTime.Format("2006-01-02")
+			keyFour := "scheduals_" + recordDate + "_" + strconv.FormatInt(orgId, 10)
+
+			redis.Set(keyFour, "", time.Second)
+			keyFive := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":his_advices_list_all"
+			redis.Set(keyFive, "", time.Second)
+			defer redis.Close()
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"msg": "1",
+			"ids": ids,
+		})
+		return
+	}
+
+}
+
 func (this *DialysisAPIController) CheckSchedule() {
 
 	patientID, _ := this.GetInt64("patient_id")

controllers/mobile_api_controllers/dialysis_api_controller_extend.go

@@ -509,6 +509,7 @@ func (this *DialysisAPIController) AddUrgentSchedule() {
 				Status:       1,
 				CreatedTime:  time.Now().Unix(),
 				UpdatedTime:  time.Now().Unix(),
+				IsExport:     5,
 			}
 			createErr := service.CreateSchedule(newSchedule)
 			redis := service.RedisClient()

controllers/mobile_api_controllers/doctor_advice_api_controller.go

@@ -5,6 +5,7 @@ import (
 	"XT_New/models"
 	"XT_New/service"
 	"XT_New/utils"
+	"fmt"
 	"strconv"
 	"time"
 )
@@ -26,7 +27,7 @@ func (this *DoctorAdviceAPIController) ScheduleAdvices() {
 		adviceType = 0
 	}
 
-	if patientType != 1 && patientType != 2 {
+	if patientType != 1 && patientType != 2 && patientType != 3 && patientType != 4 {
 
 		patientType = 0
 	}
@@ -43,12 +44,14 @@ func (this *DoctorAdviceAPIController) ScheduleAdvices() {
 	key := strconv.FormatInt(orgID, 10) + ":" + ":patient_list_all"
 	redis.Set(key, "", time.Second)
 	scheduals, err := service.MobileGetScheduleDoctorAdvicesTwo(orgID, date.Unix(), adviceType, patientType, adminInfo.AdminUser.Id, delivery_way)
+
+	fmt.Println("scheduals00923923999233223", scheduals)
 	//获取所有的患者
 	blood_patients, _ := service.GetAllPatientListByListSeven(orgID)
 	//获取透析处方
 	blood_prescriptions, _ := service.GetAllPrescriptionByListOne(orgID, date.Unix())
 	//获取上机
-	blood_dialysisOrders, _ := service.GetAllDialysisOrdersByListTwo(orgID, date.Unix())
+	blood_dialysisOrders, _ := service.GetAllDialysisOrdersByListSeven(orgID, date.Unix())
 
 	for key, schedule := range scheduals {
 		for _, patient := range blood_patients {
@@ -78,6 +81,7 @@ func (this *DoctorAdviceAPIController) ScheduleAdvices() {
 	config, _ := service.GetHisDoctorConfig(orgID)
 	project_config, _ := service.GetHisProjectConfig(orgID)
 
+	fmt.Println("project_config23323232322323", project_config.IsOpen)
 	if project_config.IsOpen == 1 || project_config.IsOpen == 2 {
 		//获取his医嘱数据
 		project, _ := service.GetMobileHisPrescriptionProject(orgID, date.Unix(), delivery_way, patientType, adminInfo.AdminUser.Id)
@@ -111,7 +115,7 @@ func (this *DoctorAdviceAPIController) ScheduleAdvices() {
 		prescriptions, _ := service.GetAllPrescriptionByListOne(orgID, date.Unix())
 
 		//获取上机
-		dialysisOrders, _ := service.GetAllDialysisOrdersByListTwo(orgID, date.Unix())
+		dialysisOrders, _ := service.GetAllDialysisOrdersByListSeven(orgID, date.Unix())
 
 		for key, item := range project {
 			for _, patient := range patients {
@@ -153,7 +157,7 @@ func (this *DoctorAdviceAPIController) ScheduleAdvices() {
 		} else {
 			filtedScheduals := []*service.MScheduleDoctorAdviceVMOne{}
 			for _, schedual := range scheduals {
-				if len(schedual.DoctorAdvices) > 0 {
+				if len(schedual.DoctorAdvices) > 0 || len(hisAdvices) > 0 {
 					filtedScheduals = append(filtedScheduals, schedual)
 				}
 			}

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -178,4 +178,14 @@ func MobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/checksch/get", &DialysisAPIController{}, "Get:CheckSchedule")
 
 	//beego.Router("/m/api/getscheduletypebyidlist",&DialysisAPIController{},"Get:GetScheduleTypeByIdList")
+
+	beego.Router("/m/api/getscheduletypebyidlist", &DialysisAPIController{}, "Get:GetScheduleTypeByIdList")
+
+	beego.Router("/m/api/savepatientpicture", &DialysisAPIController{}, "Get:SavePatientPicture")
+
+	beego.Router("/m/api/exectionmobileadvice", &DialysisAPIController{}, "Get:ExectionMobileAdvice")
+
+	beego.Router("/m/api/settlemobileadvice", &DialysisAPIController{}, "Get:GetSettleMobileAdvice")
+
+	beego.Router("/m/api/checkmobileadvice", &DialysisAPIController{}, "Get:GetCheckMobileAdvice")
 }

controllers/mobile_api_controllers/patient_api_controller.go

@@ -723,7 +723,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								total = list.Count*medical.MinNumber + list.StockMinNumber
 								prescribing_number_total = count
 							}
-							fmt.Println("meiddidididssddssddsdsds", medical.IsUse)
+
 							if medical.IsUse == 1 {
 								c.ServeSuccessJSON(map[string]interface{}{
 									"msg":    "1",
@@ -1686,6 +1686,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
@@ -1766,11 +1767,16 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 		newprescribe.Status = 1
 		newprescribe.DialysisDialyszers = dialysisSolution.DialysisDialyszers
 		newprescribe.DialysisIrrigation = dialysisSolution.DialysisIrrigation
+		newprescribe.Remark = lastDialysisPrescription.Remark
 		_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, theAssessmentDateTime, adminUserInfo.Org.Id)
 		newprescribe.ID = dialysisPrescription.ID
 
 		if dialysisPrescription.ID == 0 {
-			fmt.Println("处方11111111111")
+			if adminUserInfo.Org.Id == 10340 {
+				newprescribe.Sodium = 138
+				newprescribe.Bicarbonate = 31.1
+				newprescribe.DialysateFlow = 500
+			}
 			err := service.AddSigleRecord(&newprescribe)
 			//获取key,清空redis
 			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
@@ -1796,6 +1802,11 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
 			}
 		} else {
+			if adminUserInfo.Org.Id == 10340 {
+				newprescribe.Sodium = 138
+				newprescribe.Bicarbonate = 31.1
+				newprescribe.DialysateFlow = 500
+			}
 			err := service.UpDateDialysisPrescription(&newprescribe)
 			//获取key,清空redis
 			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
@@ -1874,9 +1885,15 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 			newprescribe.Status = 1
 			newprescribe.DialysisIrrigation = lastDialysisPrescribe.DialysisIrrigation
 			newprescribe.DialysisDialyszers = lastDialysisPrescribe.DialysisDialyszers
+			newprescribe.Remark = lastDialysisPrescription.Remark
 			_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, theAssessmentDateTime, adminUserInfo.Org.Id)
 			newprescribe.ID = dialysisPrescription.ID
 			if dialysisPrescription.ID == 0 {
+				if adminUserInfo.Org.Id == 10340 {
+					newprescribe.Sodium = 138
+					newprescribe.Bicarbonate = 31.1
+					newprescribe.DialysateFlow = 500
+				}
 				err := service.AddSigleRecord(&newprescribe)
 				//获取key,清空redis
 				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
@@ -1898,7 +1915,7 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 
 				keySeven := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":dialysis_prescribe_by_mode"
 				redis.Set(keySeven, "", time.Second)
-				fmt.Println("处方2222222222")
+
 				if err != nil {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
 				}
@@ -1981,12 +1998,17 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 			newprescribe.Status = 1
 			newprescribe.DialysisDialyszers = system_dialysisPrescribe.DialysisDialyszers
 			newprescribe.DialysisIrrigation = system_dialysisPrescribe.DialysisIrrigation
+			newprescribe.Remark = lastDialysisPrescription.Remark
 			_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, theAssessmentDateTime, adminUserInfo.Org.Id)
 			newprescribe.ID = dialysisPrescription.ID
 			if dialysisPrescription.ID == 0 {
+				if adminUserInfo.Org.Id == 10340 {
+					newprescribe.Sodium = 138
+					newprescribe.Bicarbonate = 31.1
+					newprescribe.DialysateFlow = 500
+				}
 				err := service.AddSigleRecord(&newprescribe)
 
-				fmt.Println("处方2222222222")
 				//获取key,清空redis
 				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
 				redis := service.RedisClient()
@@ -2011,6 +2033,11 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
 				}
 			} else {
+				if adminUserInfo.Org.Id == 10340 {
+					newprescribe.Sodium = 138
+					newprescribe.Bicarbonate = 31.1
+					newprescribe.DialysateFlow = 500
+				}
 				err := service.UpDateDialysisPrescription(&newprescribe)
 				//获取key,清空redis
 				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
@@ -2055,8 +2082,13 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 			_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, theAssessmentDateTime, adminUserInfo.Org.Id)
 			newprescribe.ID = dialysisPrescription.ID
 			if dialysisPrescription.ID == 0 {
+				if adminUserInfo.Org.Id == 10340 {
+					newprescribe.Sodium = 138
+					newprescribe.Bicarbonate = 31.1
+					newprescribe.DialysateFlow = 500
+				}
 				err := service.AddSigleRecord(&newprescribe)
-				fmt.Println("处方44444444444")
+
 				//获取key,清空redis
 				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
 				redis := service.RedisClient()
@@ -2081,6 +2113,11 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
 				}
 			} else {
+				if adminUserInfo.Org.Id == 10340 {
+					newprescribe.Sodium = 138
+					newprescribe.Bicarbonate = 31.1
+					newprescribe.DialysateFlow = 500
+				}
 				err := service.UpDateDialysisPrescription(&newprescribe)
 				//获取key,清空redis
 				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
@@ -3247,7 +3284,7 @@ func (c *PatientApiController) GetPatientMonitor() {
 	//获取患者的透析次数
 	count, err := service.GetDialysisCount(orgID, partition)
 
-	patients, err := service.GetAllpatient(orgID)
+	patients, err := service.GetAllpatientThirty(orgID)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"monitor":      monitor,
@@ -3659,7 +3696,7 @@ func (c *PatientApiController) CreateGroupAdvice() {
 			advice.UserOrgId = adminUserInfo.Org.Id
 			advice.PatientId = patientInfo.ID
 			advice.AdviceDoctor = adminUserInfo.AdminUser.Id
-
+			advice.IsSettle = 2
 			//入口
 			errcode := c.setAdviceWithJSON(&advice, adviceNameM)
 			if errcode > 0 {
@@ -3685,7 +3722,7 @@ func (c *PatientApiController) CreateGroupAdvice() {
 						s.UserOrgId = adminUserInfo.Org.Id
 						s.PatientId = patientInfo.ID
 						s.AdviceDoctor = adminUserInfo.AdminUser.Id
-
+						s.IsSettle = 2
 						errcode := c.setAdviceWithJSON(&s, subdrug.(map[string]interface{}))
 						if errcode > 0 {
 							c.ServeFailJSONWithSGJErrorCode(errcode)
@@ -3772,7 +3809,7 @@ func (c *PatientApiController) CreateGroupAdvice() {
 		advice.UserOrgId = adminUserInfo.Org.Id
 		advice.PatientId = patient
 		advice.AdviceDoctor = adminUserInfo.AdminUser.Id
-
+		advice.IsSettle = 2
 		err := service.CreateDoctorAdvice(&advice)
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
 		redis := service.RedisClient()
@@ -3780,7 +3817,6 @@ func (c *PatientApiController) CreateGroupAdvice() {
 		redis.Set(key, "", time.Second)
 		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":advice_list_all"
 		redis.Set(keyOne, "", time.Second)
-		fmt.Println("key`2232333332233223233232", key)
 		defer redis.Close()
 		if err != nil {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateDoctorAdviceFail)

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

@@ -249,6 +249,7 @@ func (this *StaffScheduleApiController) GetAllZone() {
 
 	id := this.GetMobileAdminUserInfo().Org.Id
 	zone, err := service.GetAllMobileZone(id)
+
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
 		return
@@ -283,18 +284,21 @@ func (this *StaffScheduleApiController) GetPatientScheduleList() {
 		//获取当天排班的病人情况
 		schedule, err := service.GetPatientSchedule(startTime, zoneid, classtype, orgid)
 
+		zonelist, _ := service.GetPatientScheduleListByZone(startTime, classtype, orgid)
 		if err != nil {
 			this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
 			return
 		}
 		this.ServeSuccessJSON(map[string]interface{}{
 			"schedule": schedule,
+			"zonelist": zonelist,
 		})
 	}
 	if is_open == 1 {
 		//获取空床位的排班数据
 		list, err := service.GetPatientScheduleByBed(startTime, zoneid, orgid, classtype)
 		stockType, _ := service.GetStockType(orgid)
+		zonelist, _ := service.GetPatientScheduleListByZone(startTime, classtype, orgid)
 		if err != nil {
 			this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
 			return
@@ -302,6 +306,7 @@ func (this *StaffScheduleApiController) GetPatientScheduleList() {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"schedule":  list,
 			"stockType": stockType,
+			"zonelist":  zonelist,
 		})
 	}
 }
@@ -714,7 +719,6 @@ func (c *StaffScheduleApiController) GetSolutionSchedule() {
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", scheduleDate+" 00:00:00", loc)
-	fmt.Println("时间错2332233323223", theTime.Unix())
 	schedule, _ := service.GetSolutionScheduleBySchedule(orgId, zoneid, classtype, theTime.Unix())
 	c.ServeSuccessJSON(map[string]interface{}{
 		"schedule": schedule,
@@ -752,17 +756,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 +786,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 +800,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 +816,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)
@@ -936,6 +937,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())
 	}
@@ -1313,7 +1315,7 @@ func (c *PatientApiController) CreateGroupAdvice() {
 		advice.UserOrgId = adminUserInfo.CurrentOrgId
 		advice.PatientId = patientInfo.ID
 		advice.AdviceDoctor = adminUserInfo.AdminUser.Id
-
+		advice.IsSettle = 2
 		if adviceNameM["advice_name"] == nil || reflect.TypeOf(adviceNameM["advice_name"]).String() != "string" {
 			utils.ErrorLog("advice_name")
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -1466,7 +1468,7 @@ func (c *PatientApiController) CreateGroupAdvice() {
 					child.UserOrgId = adminUserInfo.CurrentOrgId
 					child.PatientId = patientInfo.ID
 					child.AdviceDoctor = adminUserInfo.AdminUser.Id
-
+					child.IsSettle = 2
 					if childMap["advice_name"] == nil || reflect.TypeOf(childMap["advice_name"]).String() != "string" {
 						utils.ErrorLog("child advice_name")
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -1542,13 +1544,12 @@ func (c *PatientApiController) CreateGroupAdvice() {
 
 	list, err := service.CreateMGroupAdvice(adminUserInfo.CurrentOrgId, advices, groupNo)
 	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(AdviceDate, 10) + ":doctor_advices"
-	//fmt.Println("key23323323232323223233223232323",key)
+
 	redis := service.RedisClient()
 	defer redis.Close()
 	redis.Set(key, "", time.Second)
 	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(AdviceDate, 10) + ":advice_list_all"
 	redis.Set(keyOne, "", time.Second)
-	//fmt.Println("keyOne23322322323232323233232332",keyOne)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateDoctorAdviceFail)
 		return
@@ -3877,6 +3878,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
 }
 
@@ -5235,7 +5241,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/print_data_api_controller.go

@@ -36,43 +36,127 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 
 	idStrs := strings.Split(schIDStr, ",")
 	adminUserInfo := this.GetAdminUserInfo()
-	schedules, getScheduleErr := service.GetSchedules(adminUserInfo.CurrentOrgId, idStrs)
-	for _, item := range schedules {
-		list, _ := service.GetDialysisOrderCountSeven(item.PatientID, item.ScheduleDate)
-		if this.GetAdminUserInfo().CurrentOrgId != 10101 && this.GetAdminUserInfo().CurrentOrgId != 9671 {
-			item.Count = list.Count
+
+	if this.GetAdminUserInfo().CurrentOrgId == 10016 || this.GetAdminUserInfo().CurrentOrgId == 9671 {
+		schedules, getScheduleErr := service.GetSchedulesSeven(adminUserInfo.CurrentOrgId, idStrs)
+		for _, item := range schedules {
+
+			//获取透析上机
+			order, _ := service.GetBatchDialysisOrder(this.GetAdminUserInfo().CurrentOrgId, item.PatientID, item.ScheduleDate)
+			item.DialysisOrder = order
+
+			//获取透析处方
+			prescription, _ := service.GetBatchPrescription(this.GetAdminUserInfo().CurrentOrgId, item.PatientID, item.ScheduleDate)
+			item.Prescription = prescription
+			//接诊评估
+			receiveTreatmentAsses, _ := service.GetBatchReceiveTreatmentAsses(this.GetAdminUserInfo().CurrentOrgId, item.PatientID, item.ScheduleDate)
+			item.ReceiveAssessment = receiveTreatmentAsses
+
+			//透前评估
+			assessmentBeforeDislysisVM, _ := service.GetBatchAssessmentBeforeDislysisVM(this.GetAdminUserInfo().CurrentOrgId, item.PatientID, item.ScheduleDate)
+			item.AssessmentBeforeDislysis = assessmentBeforeDislysisVM
+
+			//透后评估
+			assessmentAfterDislysisVM, _ := service.GetBatchAssessmentAfterDislysisVM(this.GetAdminUserInfo().CurrentOrgId, item.PatientID, item.ScheduleDate)
+			item.AssessmentAfterDislysis = assessmentAfterDislysisVM
+
+			//上次透后体重
+			lastAfterWeight, _ := service.GetBatchLastAfterWeight(this.GetAdminUserInfo().CurrentOrgId, item.PatientID, item.ScheduleDate)
+			item.LastAfterWeight = lastAfterWeight
+
+			//透析监测
+			monitor, _ := service.GetBatchMonitor(this.GetAdminUserInfo().CurrentOrgId, item.PatientID, item.ScheduleDate)
+			item.MonitoringRecords = monitor
+
+			//透析医嘱
+			advice, _ := service.GetBatchDoctorAdvice(this.GetAdminUserInfo().CurrentOrgId, item.PatientID, item.ScheduleDate)
+			item.Advices = advice
+
+			//双人核对
+			dobuleCheck, _ := service.GetBatchDobuleCheck(this.GetAdminUserInfo().CurrentOrgId, item.PatientID, item.ScheduleDate)
+			item.DoubleCheck = dobuleCheck
+
+			//透析小结
+			summerVM, _ := service.GetBatchSummerVM(this.GetAdminUserInfo().CurrentOrgId, item.PatientID, item.ScheduleDate)
+			item.Summer = summerVM
+
+			list, _ := service.GetDialysisOrderCountSeven(item.PatientID, item.ScheduleDate)
+			if this.GetAdminUserInfo().CurrentOrgId != 10101 && this.GetAdminUserInfo().CurrentOrgId != 9671 {
+				item.Count = list.Count
+			}
+			if this.GetAdminUserInfo().CurrentOrgId == 10101 || this.GetAdminUserInfo().CurrentOrgId == 9671 {
+				listOne, _ := service.GetDialysisOrderCountEight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
+
+				item.Patient.TotalDialysis = listOne.Count
+				item.Count = listOne.Count
+			}
+		}
+		if getScheduleErr != nil {
+			this.ErrorLog("获取打印透析记录失败：%v", getScheduleErr)
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
 		}
-		if this.GetAdminUserInfo().CurrentOrgId == 10101 || this.GetAdminUserInfo().CurrentOrgId == 9671 {
-			listOne, _ := service.GetDialysisOrderCountEight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
 
-			item.Patient.TotalDialysis = listOne.Count
-			item.Count = listOne.Count
+		medicalStaffs, getMedicalStaffErr := service.GetMedicalStaffs(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId)
+		if getMedicalStaffErr != nil {
+			this.ErrorLog("获取医护人员失败:%v", getMedicalStaffErr)
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
 		}
-	}
-	if getScheduleErr != nil {
-		this.ErrorLog("获取打印透析记录失败：%v", getScheduleErr)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	}
 
-	medicalStaffs, getMedicalStaffErr := service.GetMedicalStaffs(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId)
-	if getMedicalStaffErr != nil {
-		this.ErrorLog("获取医护人员失败:%v", getMedicalStaffErr)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
+		adminUser, _ := service.GetAllAdminUsers(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId)
+		name, getScheduleErr := service.GetAllName(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId)
+		templateInfo, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
+
+		this.ServeSuccessJSON(map[string]interface{}{
+			"schedules":      schedules,
+			"medical_staffs": medicalStaffs,
+			"users":          adminUser,
+			"templateInfo":   templateInfo,
+			"name":           name,
+		})
 	}
 
-	adminUser, _ := service.GetAllAdminUsers(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId)
-	name, getScheduleErr := service.GetAllName(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId)
-	templateInfo, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
+	if this.GetAdminUserInfo().CurrentOrgId != 10016 && this.GetAdminUserInfo().CurrentOrgId != 9671 {
+		schedules, getScheduleErr := service.GetSchedules(adminUserInfo.CurrentOrgId, idStrs)
+		for _, item := range schedules {
+			list, _ := service.GetDialysisOrderCountSeven(item.PatientID, item.ScheduleDate)
+			if this.GetAdminUserInfo().CurrentOrgId != 10101 && this.GetAdminUserInfo().CurrentOrgId != 9671 {
+				item.Count = list.Count
+			}
+			if this.GetAdminUserInfo().CurrentOrgId == 10101 || this.GetAdminUserInfo().CurrentOrgId == 9671 {
+				listOne, _ := service.GetDialysisOrderCountEight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
+
+				item.Patient.TotalDialysis = listOne.Count
+				item.Count = listOne.Count
+			}
+		}
+		if getScheduleErr != nil {
+			this.ErrorLog("获取打印透析记录失败：%v", getScheduleErr)
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+
+		medicalStaffs, getMedicalStaffErr := service.GetMedicalStaffs(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId)
+		if getMedicalStaffErr != nil {
+			this.ErrorLog("获取医护人员失败:%v", getMedicalStaffErr)
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+
+		adminUser, _ := service.GetAllAdminUsers(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId)
+		name, getScheduleErr := service.GetAllName(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId)
+		templateInfo, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
+
+		this.ServeSuccessJSON(map[string]interface{}{
+			"schedules":      schedules,
+			"medical_staffs": medicalStaffs,
+			"users":          adminUser,
+			"templateInfo":   templateInfo,
+			"name":           name,
+		})
+	}
 
-	this.ServeSuccessJSON(map[string]interface{}{
-		"schedules":      schedules,
-		"medical_staffs": medicalStaffs,
-		"users":          adminUser,
-		"templateInfo":   templateInfo,
-		"name":           name,
-	})
 }
 
 func (this *PrintDataAPIController) StockRecordPrintData() {

controllers/schedule_api_controller.go

@@ -41,6 +41,7 @@ func ScheduleApiRegistRouters() {
 
 	beego.Router("/api/schedule_template/cancel", &ScheduleApiController{}, "post:CancelScheduleTemplate")
 	beego.Router("/api/schedule/getnextscheduleweekday", &ScheduleApiController{}, "Get:GetNextWeekDaySchedule")
+	beego.Router("/api/schedule/getnextscheduleweekdayone", &ScheduleApiController{}, "Get:GetNextWeekDayScheduleOne")
 
 	beego.Router("/api/schedule/getthreeweeklist", &ScheduleApiController{}, "Get:GetThreeWeekList")
 
@@ -1261,6 +1262,7 @@ func (c *ScheduleApiController) CreateSchedule() {
 	schedule.UpdatedTime = time.Now().Unix()
 	schedule.Status = 1
 	schedule.UserOrgId = adminUserInfo.CurrentOrgId
+	schedule.IsExport = 5
 
 	so, _ := service.GetDialysisSolutionTwo(adminUserInfo.CurrentOrgId, schedule.PatientId, schedule.ModeId)
 	filedRecordOne, _ := service.FindFiledBy(adminUserInfo.CurrentOrgId, "透析器")
@@ -3128,17 +3130,59 @@ func (c *ScheduleApiController) CancelScheduleTemplate() {
 		return
 	}
 }
+func (this *ScheduleApiController) GetNextWeekDayScheduleOne() {
+	week_type, _ := this.GetInt64("week_type", -1)
+	week_time, _ := this.GetInt64("week_time")
+	record_date := this.GetString("record_date")
+
+	zons := this.GetString("zone")
+	zone := strings.Split(zons, ",")
+
+	start_time, _ := this.GetInt64("start_time")
+	end_time, _ := this.GetInt64("end_time")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	//theTimeStart, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	//theTimeEnd, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 00:00:00", loc)
+
+	adminUserInfo := this.GetAdminUserInfo()
+	var theStartTIme int64
+	if len(record_date) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+		}
+		theStartTIme = theTime.Unix()
+	}
+
+	schedule, err := service.GetNextWeekDaySchedule(week_type, week_time, start_time, end_time, adminUserInfo.CurrentOrgId, zone, theStartTIme)
+	for _, item := range schedule {
+		order, _ := service.GetLastDialysisOrder(adminUserInfo.CurrentOrgId, item.PatientId, theStartTIme)
+		item.XtDialysisOrderSix = order
+		if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 9675 || adminUserInfo.CurrentOrgId == 10340 {
+
+			dialysisprescription, _ := service.GetLastDialysisSolution(adminUserInfo.CurrentOrgId, item.PatientId, item.ModeId, item.ScheduleDate)
+			item.DialysisPrescription = dialysisprescription
+		}
+	}
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"schedule": schedule,
+	})
+}
 
 func (this *ScheduleApiController) GetNextWeekDaySchedule() {
 
 	week_type, _ := this.GetInt64("week_type", -1)
 	week_time, _ := this.GetInt64("week_time")
-	//start_time, _ := this.GetInt64("start_time")
-	//end_time, _ := this.GetInt64("end_time")
 	record_date := this.GetString("record_date")
 
 	zons := this.GetString("zone")
 	zone := strings.Split(zons, ",")
+
 	start_time := this.GetString("start_time")
 	end_time := this.GetString("end_time")
 	timeLayout := "2006-01-02"
@@ -3578,7 +3622,16 @@ func (this *ScheduleApiController) GetBloodScheduleList() {
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	if week_type > 0 {
 		list, err := service.GetWeekDayScheduleByIdThee(orgId, targetDay.Unix(), week_time, zone)
+		for _, item := range list {
+			order, _ := service.GetLastDialysisOrder(orgId, item.PatientId, targetDay.Unix())
+			item.XtDialysisOrderSix = order
+			if orgId == 9671 || orgId == 9675 || orgId == 10340 {
 
+				solution, _ := service.GetLastDialysisSolution(orgId, item.PatientId, item.ModeId, item.ScheduleDate)
+				item.DialysisPrescription = solution
+			}
+
+		}
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			return
@@ -3593,7 +3646,17 @@ func (this *ScheduleApiController) GetBloodScheduleList() {
 	if week_type == 0 {
 		startDate, _ := utils.ParseTimeStringToTime("2006-01-02", startTime)
 		list, err := service.GetWeekDayScheduleByIdTwo(orgId, targetDay.Unix(), week_time, startDate.Unix(), zone)
+		for _, item := range list {
+
+			order, _ := service.GetLastDialysisOrder(orgId, item.PatientId, targetDay.Unix())
+			item.XtDialysisOrderSix = order
+			if orgId == 9671 || orgId == 9675 || orgId == 10340 {
 
+				solution, _ := service.GetLastDialysisSolution(orgId, item.PatientId, item.ModeId, item.ScheduleDate)
+				item.DialysisPrescription = solution
+			}
+
+		}
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			return

models/device_models.go

@@ -1175,3 +1175,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

@@ -457,6 +457,7 @@ type DoctorAdvice struct {
 	DrugNameId            int64           `gorm:"column:drug_name_id" json:"drug_name_id" form:"drug_name_id"`
 	IsMedicine            int64           `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
 	PushStartTime         int64           `gorm:"column:push_start_time" json:"push_start_time" form:"push_start_time"`
+	IsSettle              int64           `gorm:"column:is_settle" json:"is_settle" form:"is_settle"`
 }
 
 func (DoctorAdvice) TableName() string {
@@ -846,6 +847,8 @@ type DialysisOrder struct {
 	BloodAccessId              int64         `gorm:"column:blood_access_id" json:"blood_access_id" form:"blood_access_id"`
 	Mission                    string        `gorm:"column:mission" json:"mission" form:"mission"`
 	NucleinDate                int64         `gorm:"column:nuclein_date" json:"nuclein_date" form:"nuclein_date"`
+	ScheduleRemark             string        `gorm:"column:schedule_remark" json:"schedule_remark" form:"schedule_remark"`
+	OrderRemark                string        `gorm:"column:order_remark" json:"order_remark" form:"order_remark"`
 }
 
 func (DialysisOrder) TableName() string {
@@ -1095,14 +1098,36 @@ type DialysisBeforePrepareGoods struct {
 }
 
 type NewDialysisBeforePrepareGoods struct {
-	GoodId            int64  `gorm:"column:good_id" json:"good_id" form:"good_id"`
-	Count             int64  `gorm:"column:count" json:"count" form:"count"`
-	GoodTypeId        int64  `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
-	TypeName          string `gorm:"column:type_name" json:"type_name" form:"type_name"`
-	SpecificationName string `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
-	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"`
+	GoodId                             int64                            `gorm:"column:good_id" json:"good_id" form:"good_id"`
+	Count                              int64                            `gorm:"column:count" json:"count" form:"count"`
+	GoodTypeId                         int64                            `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
+	TypeName                           string                           `gorm:"column:type_name" json:"type_name" form:"type_name"`
+	SpecificationName                  string                           `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	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"`
+	ChildNewDialysisBeforePrepareGoods []*NewDialysisBeforePrepareGoods `gorm:"ForeignKey:GoodId;AssociationForeignKey:GoodId" json:"child"`
+}
+
+type OldDialysisBeforePrepareGoods 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"`
+	PatientId    int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	RecordDate   int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	GoodId       int64  `gorm:"column:good_id" json:"good_id" form:"good_id"`
+	GoodTypeId   int64  `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
+	Count        int64  `gorm:"column:count" json:"count" form:"count"`
+	Ctime        int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime        int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Creater      int64  `gorm:"column:creater" json:"creater" form:"creater"`
+	Modifier     int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	Status       int64  `gorm:"column:status" json:"status" form:"status"`
+	CommdityCode string `gorm:"column:commdity_code" json:"commdity_code" form:"commdity_code"`
+	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"`
 }
 
 type QueueCallConfig struct {
@@ -1207,17 +1232,18 @@ func (HisDoctorAdvice) TableName() string {
 }
 
 type DialysisScheduleSix 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"`
-	Name         string `gorm:"column:name" json:"name" form:"name"`
+	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"`
+	Name                string `gorm:"column:name" json:"name" form:"name"`
+	DialysisOrderTwenty `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"order"`
 }
 
 type DialysisScheduleSeven struct {
@@ -1231,3 +1257,129 @@ type DialysisScheduleSeven struct {
 func (DialysisScheduleSeven) TableName() string {
 	return "xt_schedule"
 }
+
+type DialysisOrderTwenty struct {
+	ID                 int64        `gorm:"column:id" json:"id"`
+	DialysisDate       int64        `gorm:"column:dialysis_date" json:"dialysis_date"`
+	UserOrgId          int64        `gorm:"column:user_org_id" json:"user_org_id"`
+	PatientId          int64        `gorm:"column:patient_id" json:"patient_id"`
+	Stage              int64        `gorm:"column:stage" json:"stage"`
+	Remark             string       `gorm:"column:remark" json:"remark"`
+	BedID              int64        `gorm:"column:bed_id" json:"bed_id"`
+	Status             int64        `gorm:"column:status" json:"status"`
+	DeviceNumber       DeviceNumber `gorm:"ForeignKey:BedID"`
+	StartTime          int64        `gorm:"column:start_time" json:"start_time"`
+	SchedualType       int64        `gorm:"column:schedual_type" json:"schedual_type"`
+	ZoneId             int64        `gorm:"column:zone_id" json:"zone_id" form:"zone_id"`
+	BloodAccessId      int64        `gorm:"column:blood_access_id" json:"blood_access_id" form:"blood_access_id"`
+	DialysisIrrigation string       `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
+	DialysisDialyszers string       `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
+	OrderRemark        string       `gorm:"column:order_remark" json:"order_remark" form:"order_remark"`
+	ScheduleRemark     string       `gorm:"column:schedule_remark" json:"schedule_remark" form:"schedule_remark"`
+}
+
+func (DialysisOrderTwenty) TableName() string {
+	return "xt_dialysis_order"
+}
+
+type HisDoctorAdviceThirty 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"`
+	PatientId             int64                    `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	AdviceDate            int64                    `gorm:"column:advice_date" json:"advice_date" form:"advice_date"`
+	StartTime             int64                    `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	AdviceName            string                   `gorm:"column:advice_name" json:"advice_name" form:"advice_name"`
+	PrescribingNumber     float64                  `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
+	PrescribingNumberUnit string                   `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	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"`
+	ParentId              int64                    `gorm:"column:parent_id" json:"parent_id" form:"parent_id"`
+	ExecutionTime         int64                    `gorm:"column:execution_time" json:"execution_time" form:"execution_time"`
+	ExecutionStaff        int64                    `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
+	ExecutionState        int64                    `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
+	Checker               int64                    `gorm:"column:checker" json:"checker" form:"checker"`
+	CheckTime             int64                    `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	CheckState            int64                    `gorm:"column:check_state" json:"check_state" form:"check_state"`
+	ChildDoctorAdvice     []*HisDoctorAdviceThirty `gorm:"ForeignKey:DrugId;AssociationForeignKey:DrugId" json:"child"`
+	IsCheck               int64                    `gorm:"-" json:"is_check" form:"is_check"`
+	Way                   int64                    `gorm:"column:way" json:"way" form:"way"`
+	IsSettle              int64                    `gorm:"column:is_settle" json:"is_settle" form:"is_settle"`
+}
+
+func (HisDoctorAdviceThirty) TableName() string {
+	return "his_doctor_advice_info"
+}
+
+type DoctorAdviceThrity struct {
+	ID                    int64                 `gorm:"column:id" json:"id" form:"id"`
+	GroupNo               int64                 `gorm:"column:groupno" json:"groupno" form:"groupno"`
+	UserOrgId             int64                 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId             int64                 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	AdviceType            int64                 `gorm:"column:advice_type" json:"advice_type" form:"advice_type"`
+	AdviceDate            int64                 `gorm:"column:advice_date" json:"advice_date" form:"advice_date"`
+	StartTime             int64                 `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	AdviceName            string                `gorm:"column:advice_name" json:"advice_name" form:"advice_name"`
+	AdviceDesc            string                `gorm:"column:advice_desc" json:"advice_desc" form:"advice_desc"`
+	ReminderDate          int64                 `gorm:"column:reminder_date" json:"reminder_date" form:"reminder_date"`
+	SingleDose            float64               `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	SingleDoseUnit        string                `gorm:"column:single_dose_unit" json:"single_dose_unit" form:"single_dose_unit"`
+	DrugSpec              float64               `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugSpecUnit          string                `gorm:"column:drug_spec_unit" json:"drug_spec_unit" form:"drug_spec_unit"`
+	PrescribingNumber     float64               `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
+	PrescribingNumberUnit string                `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	DeliveryWay           string                `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency    string                `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	AdviceDoctor          int64                 `gorm:"column:advice_doctor" json:"advice_doctor" form:"advice_doctor"`
+	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"`
+	AdviceAffirm          string                `gorm:"column:advice_affirm" json:"advice_affirm" form:"advice_affirm"`
+	Remark                string                `gorm:"column:remark" json:"remark" form:"remark"`
+	StopTime              int64                 `gorm:"column:stop_time" json:"stop_time" form:"stop_time"`
+	StopReason            string                `gorm:"column:stop_reason" json:"stop_reason" form:"stop_reason"`
+	StopDoctor            int64                 `gorm:"column:stop_doctor" json:"stop_doctor" form:"stop_doctor"`
+	StopState             int64                 `gorm:"column:stop_state" json:"stop_state" form:"stop_state"`
+	ParentId              int64                 `gorm:"column:parent_id" json:"parent_id" form:"parent_id"`
+	ExecutionTime         int64                 `gorm:"column:execution_time" json:"execution_time" form:"execution_time"`
+	ExecutionStaff        int64                 `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
+	ExecutionState        int64                 `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
+	Checker               int64                 `gorm:"column:checker" json:"checker" form:"checker"`
+	RecordDate            int64                 `gorm:"column:record_date" json:"record_date"`
+	DialysisOrderId       int64                 `gorm:"column:dialysis_order_id" json:"dialysis_order_id"`
+	CheckTime             int64                 `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	CheckState            int64                 `gorm:"column:check_state" json:"check_state" form:"check_state"`
+	AdviceId              int64                 `gorm:"-"`
+	RemindType            int64                 `gorm:"column:remind_type" json:"remind_type"`
+	FrequencyType         int64                 `gorm:"column:frequency_type" json:"frequency_type"`
+	DayCount              int64                 `gorm:"column:day_count" json:"day_count"`
+	WeekDay               string                `gorm:"column:week_day" json:"week_day"`
+	ChildDoctorAdvice     []*DoctorAdviceThrity `gorm:"ForeignKey:DrugId;AssociationForeignKey:DrugId" json:"child"`
+	TemplateId            string                `gorm:"column:template_id" json:"template_id"`
+	Modifier              int64                 `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	IsCheck               int64                 `gorm:"-" json:"is_check" form:"is_check"`
+	Way                   int64                 `gorm:"column:way" json:"way" form:"way"`
+	DrugId                int64                 `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	DrugNameId            int64                 `gorm:"column:drug_name_id" json:"drug_name_id" form:"drug_name_id"`
+	IsMedicine            int64                 `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
+	PushStartTime         int64                 `gorm:"column:push_start_time" json:"push_start_time" form:"push_start_time"`
+	IsSettle              int64                 `gorm:"column:is_settle" json:"is_settle" form:"is_settle"`
+}
+
+func (DoctorAdviceThrity) TableName() string {
+	return "xt_doctor_advice"
+}
+
+type XtDialysisOrderSix struct {
+	ID                 int64  `gorm:"column:id" json:"id" form:"id"`
+	DialysisDate       int64  `gorm:"column:dialysis_date" json:"dialysis_date" form:"dialysis_date"`
+	UserOrgId          int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId          int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	BloodAccessId      int64  `gorm:"column:blood_access_id" json:"blood_access_id" form:"blood_access_id"`
+	DialysisIrrigation string `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
+	DialysisDialyszers string `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
+}
+
+func (XtDialysisOrderSix) TableName() string {
+	return "xt_dialysis_order"
+}

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/good_models.go

@@ -289,3 +289,15 @@ type GoodInformationThirty struct {
 func (GoodInformationThirty) TableName() string {
 	return "xt_good_information"
 }
+
+type GoodInformationFourty struct {
+	ID                int64  `gorm:"column:id" json:"id" form:"id"`
+	SpecificationName string `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	OrgId             int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	GoodName          string `gorm:"column:good_name" json:"good_name" form:"good_name"`
+	Status            int64  `gorm:"column:status" json:"status"`
+}
+
+func (GoodInformationFourty) TableName() string {
+	return "xt_good_information"
+}

models/his_models.go

@@ -257,6 +257,8 @@ type HisDoctorAdviceInfo struct {
 	HisOrderInfo          HisOrderInfo           `gorm:"ForeignKey:AdviceId;AssociationForeignKey:ID" json:"order_info"`
 	IsMedicine            int64                  `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
 	ExecutionFrequencyId  int64                  `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
+	Child                 []*HisDoctorAdviceInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:DrugId" json:"child"`
+	IsSettle              int64                  `gorm:"column:is_settle" json:"is_settle" form:"is_settle"`
 }
 
 func (HisDoctorAdviceInfo) TableName() string {
@@ -860,6 +862,7 @@ type HisPrescriptionProject struct {
 	HisOrderInfo         HisOrderInfo `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"order_info"`
 	ExecutionFrequencyId int64        `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
 	IsOut                int64        `gorm:"column:is_out" json:"is_out" form:"is_out"` //新增字段
+
 }
 
 func (HisPrescriptionProject) TableName() string {
@@ -2426,3 +2429,16 @@ type Item struct {
 	Vaf58  string `json:"vaf58"`
 	Vaf61  string `json:"vaf61"`
 }
+
+type HisSettleStockConfig 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"`
+	Ctime     int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime     int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status    int64 `gorm:"column:status" json:"status" form:"status"`
+	IsOpen    int64 `gorm:"column:is_open" json:"is_open" form:"is_open"`
+}
+
+func (HisSettleStockConfig) TableName() string {
+	return "his_settle_stock_config"
+}

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/patient_models.go

@@ -352,6 +352,8 @@ type DialysisPrescription struct {
 	DrhyWater                  string        `gorm:"column:drhy_water" json:"drhy_water" form:"drhy_water"`
 	DryWaterHour               string        `gorm:"column:dry_water_hour" json:"dry_water_hour" form:"dry_water_hour"`
 	WaterMachine               string        `gorm:"column:water_machine" json:"water_machine" form:"water_machine"`
+	AddAmount                  float64       `gorm:"column:add_amount" json:"add_amount" form:"add_amount"`
+	ReduceAmount               float64       `gorm:"column:reduce_amount" json:"reduce_amount" form:"reduce_amount"`
 }
 
 func (DialysisPrescription) TableName() string {
@@ -457,6 +459,7 @@ type DialysisPrescriptionList struct {
 	Epo                        string  `gorm:"column:epo" json:"epo" form:"epo"`
 	EpoCount                   float64 `gorm:"column:epo_count" json:"epo_count" form:"epo_count"`
 	MaxUltrafiltrationRate     string  `gorm:"column:max_ultrafiltration_rate" json:"max_ultrafiltration_rate" form:"max_ultrafiltration_rate"`
+	WaterMachine               string  `gorm:"column:water_machine" json:"water_machine" form:"water_machine"`
 }
 
 func (DialysisPrescriptionList) TableName() string {
@@ -469,6 +472,7 @@ type DialysisAssesmentBefor struct {
 	PatientId              int64 `gorm:"column:patient_id" json:"patient_id"`
 	AssessmentDate         int64 `gorm:"column:assessment_date" json:"assessment_date" form:"assessment_date"`
 	BloodAccessPartOperaId int64 `gorm:"column:blood_access_part_opera_id" json:"blood_access_part_opera_id" form:"blood_access_part_opera_id"`
+	CreatedTime            int64 `gorm:"column:created_time" json:"created_time" form:"created_time"`
 }
 
 func (DialysisAssesmentBefor) TableName() string {
@@ -782,6 +786,7 @@ type XtPatientsNew struct {
 	TrobleShoot                  int64   `gorm:"column:troble_shoot" json:"troble_shoot" form:"troble_shoot"`
 	TreatmentPlan                string  `gorm:"column:treatment_plan" json:"treatment_plan" form:"treatment_plan"`
 	Doctor                       int64   `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	ScheduleRemark               string  `gorm:"column:schedule_remark" json:"schedule_remark" form:"schedule_remark"`
 }
 
 func (XtPatientsNew) TableName() string {
@@ -1147,6 +1152,7 @@ type XtPatients struct {
 	ContactName                  string  `gorm:"column:contact_name" json:"contact_name" form:"contact_name"`
 	UserSysBeforeCount           int64   `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
 	SchRemark                    string  `gorm:"column:sch_remark" json:"sch_remark" form:"sch_remark"`
+	ScheduleRemark               string  `gorm:"column:schedule_remark" json:"schedule_remark" form:"schedule_remark"`
 }
 
 func (XtPatients) TableName() string {
@@ -1601,9 +1607,49 @@ type XtScheduleList struct {
 	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"`
 	DialysisSolution VmDialysisSolution `gorm:"ForeignKey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId" json:"vmsolution"`
 }
 
 func (XtScheduleList) TableName() string {
 	return "xt_schedule"
 }
+
+type DialysisPrescriptionTwenty 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"`
+	ModeId                     int64  `gorm:"column:mode_id" json:"mode_id"`
+	Anticoagulant              int64  `gorm:"column:anticoagulant" json:"anticoagulant"`
+	DialysateFormulation       int64  `gorm:"column:dialysate_formulation" json:"dialysate_formulation"`
+	DialyzerPerfusionApparatus string `gorm:"column:dialyzer_perfusion_apparatus" json:"dialyzer_perfusion_apparatus"`
+	DialysisDialyszers         string `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
+	DialysisIrrigation         string `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
+}
+
+func (DialysisPrescriptionTwenty) TableName() string {
+	return "xt_dialysis_prescription"
+}
+
+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"`
+}
+
+func (DialysisPrescriptionThrity) TableName() string {
+	return "xt_dialysis_prescription"
+}
+
+type PatientsThirty 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"`
+	DialysisNo    string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
+	Name          string `gorm:"column:name" json:"name" form:"name"`
+	TotalDialysis int64  `gorm:"column:total_dialysis" json:"total_dialysis" form:"total_dialysis"`
+}
+
+func (PatientsThirty) TableName() string {
+	return "xt_patients"
+}

models/schedule_models.go

@@ -200,6 +200,7 @@ type VmSchedulesRemind struct {
 	DialysisSolution           DialysisSolution           `json:"dialysissolution" gorm:"foreignkey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId;"`
 	XtAssessmentBeforeDislysis XtAssessmentBeforeDislysis `json:"assessmentbefor" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
 	LastAfterWeight            AssessmentAfterDislysis    `gorm:"ForeignKey:PatientID;AssociationForeignKey:PatientID" json:"lastafterweight"`
+	XtDialysisOrderSix         XtDialysisOrderSix         `json:"dialysis_order" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
 }
 
 func (VmSchedulesRemind) TableName() string {
@@ -207,28 +208,32 @@ func (VmSchedulesRemind) TableName() string {
 }
 
 type WeekScheduleSix 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"`
-
+	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"`
+	IdCardNo                   string                     `gorm:"-" json:"id_card_no" form:"id_card_no"`
+	Gender                     string                     `gorm:"-" json:"gender" form:"gender"`
+	Phone                      string                     `gorm:"-" json:"phone" form:"phone"`
+	DialysisNo                 string                     `gorm:"-" json:"dialysis_no" form:"dialysis_no"`
 	Patient                    string                     `gorm:"-" json:"patient" form:"patient"`
 	DeviceZone                 DeviceZone                 `json:"zone" gorm:"foreignkey:ID;AssociationForeignKey:PartitionId;"`
 	DeviceNumber               DeviceNumber               `json:"number" gorm:"foreignkey:ID;AssociationForeignKey:BedId;"`
-	DialysisPrescription       DialysisSolution           `json:"prescription" gorm:"foreignkey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId"`
 	DoctorAdvice               []*DoctorAdvice            `json:"doctoradvice" gorm:"foreignkey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
 	HisDoctorAdviceInfo        []*HisDoctorAdviceInfo     `json:"hisdoctoradviceinfo" gorm:"foreignkey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
 	DialysisSolution           DialysisSolution           `json:"dialysissolution" gorm:"foreignkey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId"`
 	XtAssessmentBeforeDislysis XtAssessmentBeforeDislysis `json:"assessmentbefor" gorm:"foreignkey:PatientId,AssessmentDate;AssociationForeignKey:PatientId,ScheduleDate"`
+	XtDialysisOrderSix         XtDialysisOrderSix         `json:"dialysis_order" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
+	DialysisPrescription       DialysisPrescription       `json:"prescription" gorm:"foreignkey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId"`
 }
 
 func (WeekScheduleSix) TableName() string {
@@ -368,13 +373,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"`
@@ -406,6 +434,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"`
 }
 
@@ -455,3 +484,42 @@ type GoodInfoNight struct {
 func (GoodInfoNight) TableName() string {
 	return "xt_good_information"
 }
+
+type ScheduleTwenty 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"`
+	Patient             string              `gorm:"-" json:"patient" form:"patient"`
+	DeviceZone          DeviceZone          `json:"zone" gorm:"foreignkey:ID;AssociationForeignKey:PartitionId;"`
+	DeviceNumber        DeviceNumber        `json:"number" gorm:"foreignkey:ID;AssociationForeignKey:BedId;"`
+	TreatmentMode       TreatmentMode       `json:"mode" gorm:"foreignkey:ModeId"`
+	DialysisOrderTwenty DialysisOrderTwenty `json:"order" gorm:"foreignkey:DialysisDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
+}
+
+func (ScheduleTwenty) TableName() string {
+	return "xt_schedule"
+}
+
+type ScheduleTwentyOne 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"`
+	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"`
+	Status       int64 `gorm:"column:status" json:"status" form:"status"`
+}
+
+func (ScheduleTwentyOne) TableName() string {
+	return "xt_schedule"
+}

service/dialysis_service.go

@@ -1862,3 +1862,179 @@ 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
+}
+
+func GetHisExcutionDoctorAdviceListGroupList(patients []string, advice_date int64, user_org_id int64) (advice []*models.HisDoctorAdvice, err error) {
+
+	err = XTReadDB().Where("patient_id in(?) and advice_date = ? and user_org_id = ? and status = 1 and execution_state = 2", patients, advice_date, user_org_id).Group("drug_id").Find(&advice).Error
+	return advice, err
+}
+
+func GetHisExcutionDoctorAdviceList(patients []string, advice_date int64, user_org_id int64) (advice []*models.HisDoctorAdvice, err error) {
+
+	err = XTReadDB().Where("patient_id in(?) and advice_date = ? and user_org_id = ? and status = 1 and execution_state = 2", patients, advice_date, user_org_id).Find(&advice).Error
+	return advice, err
+}
+
+func UpdateHisDoctorAdviceExecution(info models.HisDoctorAdviceInfo, id int64) error {
+
+	err := XTWriteDB().Model(&info).Where("id = ? and status = 1", id).Update(map[string]interface{}{"execution_staff": info.ExecutionStaff, "execution_state": info.ExecutionState, "execution_time": info.ExecutionTime, "updated_time": info.ExecutionTime}).Error
+	return err
+}
+
+func UpdateDoctorAdviceExecution(info models.DoctorAdvice, id int64) error {
+
+	err := XTWriteDB().Model(&models.DoctorAdvice{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"execution_staff": info.ExecutionStaff, "execution_state": info.ExecutionState, "execution_time": info.ExecutionTime, "updated_time": info.ExecutionTime}).Error
+	return err
+}
+
+func GetExcutionDoctorAdviceGroupList(patients []string, advice_date int64, user_org_id int64) (advice []*models.DoctorAdviceThrity, err error) {
+
+	err = XTReadDB().Where("patient_id in(?) and advice_date = ? and user_org_id = ? and status = 1 and execution_state = 2", patients, advice_date, user_org_id).Group("drug_id").Find(&advice).Error
+	return advice, err
+}
+
+func GetExcutionDoctorAdviceList(patients []string, advice_date int64, user_org_id int64) (advice []*models.DoctorAdviceThrity, err error) {
+
+	err = XTReadDB().Where("patient_id in(?) and advice_date = ? and user_org_id = ? and status = 1 and execution_state = 2", patients, advice_date, user_org_id).Find(&advice).Error
+	return advice, err
+}
+
+func GetHisCheckDoctorAdvice(orgid int64, patinentids []string, advice_date int64) (advice []*models.HisDoctorAdviceThirty, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and patient_id in(?) and advice_date = ? and status =1", orgid, patinentids, advice_date).Find(&advice).Error
+	return advice, err
+}
+
+func CheckDoctorAdvice(id int64, creater int64) (models.DoctorAdviceThrity, error) {
+
+	doctoradvice := models.DoctorAdviceThrity{}
+	err := XTWriteDB().Model(&doctoradvice).Where("id = ? and status = 1", id).Update(map[string]interface{}{"checker": creater, "check_time": time.Now().Unix()}).Error
+	return doctoradvice, err
+}
+
+func CheckHisDoctorAdvice(id int64, creater int64) (models.HisDoctorAdviceThirty, error) {
+
+	doctoradvice := models.HisDoctorAdviceThirty{}
+	err := XTWriteDB().Model(&doctoradvice).Where("id = ? and status = 1", id).Update(map[string]interface{}{"checker": creater, "check_time": time.Now().Unix()}).Error
+	return doctoradvice, err
+}
+
+func GetCheckDoctorAdvice(orgid int64, patinentids []string, advice_date int64) (advice []*models.DoctorAdviceThrity, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and patient_id in(?) and advice_date = ? and status=1", orgid, patinentids, advice_date).Find(&advice).Error
+	return advice, err
+}
+
+func SettleHisNewDoctorAdvice(patinentids []string, advice_date int64, orgid int64) (advice []*models.HisDoctorAdviceThirty, err error) {
+
+	err = XTWriteDB().Model(&advice).Where("patient_id in(?) and advice_date = ? and user_org_id = ? and status = 1", patinentids, advice_date, orgid).Update(map[string]interface{}{"is_settle": 1}).Error
+	return advice, err
+}
+
+func SettleNewDoctorAdvice(patinentids []string, advice_date int64, orgid int64) (advice []*models.DoctorAdviceThrity, err error) {
+
+	err = XTWriteDB().Model(&advice).Where("patient_id in(?) and advice_date = ? and user_org_id = ? and status = 1", patinentids, advice_date, orgid).Update(map[string]interface{}{"is_settle": 1}).Error
+	return advice, err
+}
+
+func GetHisMobileAdviceGroupList(orgid int64, ids []string) (advice []*models.HisDoctorAdvice, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and id in(?) and status = 1", orgid, ids).Group("drug_id").Find(&advice).Error
+	return advice, err
+}
+
+func GetHisMobileAdviceList(orgid int64, ids []string) (advice []*models.HisDoctorAdvice, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and id in(?) and status = 1", orgid, ids).Find(&advice).Error
+	return advice, err
+}
+
+func ExectionMobileAdvice(orgid int64, ids []string, execution_time int64, execution_staff int64) error {
+
+	advice := models.HisDoctorAdvice{}
+	err := XTWriteDB().Model(&advice).Where("user_org_id = ? and id in(?) and status = 1", orgid, ids).Updates(map[string]interface{}{"execution_time": execution_time, "execution_staff": execution_staff, "execution_state": 1}).Error
+	return err
+}
+
+func GetBloodMobileAdviceGroupList(orgid int64, ids []string) (advice []*models.DoctorAdviceThrity, err error) {
+
+	err = XTReadDB().Model(&advice).Where("user_org_id = ? and id in(?) and status = 1", orgid, ids).Group("drug_id").Find(&advice).Error
+	return advice, err
+}
+
+func GetBloodMobileAdviceList(orgid int64, ids []string) (advice []*models.DoctorAdviceThrity, err error) {
+
+	err = XTReadDB().Model(&advice).Where("user_org_id = ? and id in(?) and status = 1", orgid, ids).Find(&advice).Error
+	return advice, err
+}
+
+func FindAllDoctorAdviceByIds(orgID int64, ids []string) (advice []models.DoctorAdvice, err error) {
+	err = readDb.Model(&models.DoctorAdvice{}).Where("user_org_id=?  AND id in(?)  AND status = 1", orgID, ids).Find(&advice).Error
+	return
+}
+
+func ExectionBloodMobileAdvice(orgid int64, ids []string, execution_time int64, execution_staff int64) error {
+	fmt.Println("ids2323232323323223233223wode", ids)
+	advice := models.DoctorAdviceThrity{}
+	err := XTWriteDB().Model(&advice).Where("user_org_id = ? and id in(?) and status = 1", orgid, ids).Updates(map[string]interface{}{"execution_time": execution_time, "execution_staff": execution_staff, "execution_state": 1}).Error
+	return err
+}
+
+func UpdateSettleMobileHisAdvice(orgid int64, ids []string) error {
+
+	advice := models.HisDoctorAdviceThirty{}
+	err := XTWriteDB().Model(&advice).Where("user_org_id = ? and id in(?) and status =1", orgid, ids).Updates(map[string]interface{}{"is_settle": 1}).Error
+	return err
+}
+
+func UpdateSettleMobileBloodAdvice(orgid int64, ids []string) error {
+
+	advice := models.DoctorAdvice{}
+	err := XTWriteDB().Model(&advice).Where("user_org_id = ? and id in(?) and status =1", orgid, ids).Updates(map[string]interface{}{"is_settle": 1}).Error
+	return err
+}
+
+func CheckBloodDoctorAdvice(orgid int64, ids []string, advice models.DoctorAdvice) error {
+
+	err := XTWriteDB().Model(&advice).Where("user_org_id = ? and id in(?) and status = 1", orgid, ids).Updates(map[string]interface{}{"check_time": advice.CheckTime, "checker": advice.Checker, "check_state": 1}).Error
+	return err
+}
+
+func CheckHisMobileDoctorAdvice(orgid int64, ids []string, advice models.HisDoctorAdviceThirty) error {
+	err := XTWriteDB().Model(&advice).Where("user_org_id = ? and id in(?) and status = 1", orgid, ids).Updates(map[string]interface{}{"check_time": advice.CheckTime, "checker": advice.Checker, "check_state": 1}).Error
+	return err
+}
+
+func GetLastOrder(user_org_id int64, patient_id int64, dialysis_date int64) (models.DialysisOrderTwenty, error) {
+
+	twenty := models.DialysisOrderTwenty{}
+
+	err := XTReadDB().Where("user_org_id = ? and patient_id =? and dialysis_date < ? and status = 1", user_org_id, patient_id, dialysis_date).Preload("DeviceNumber", func(db *gorm.DB) *gorm.DB {
+		return db.Preload("DeviceZone", "status =1").Where("org_id = ? AND status = 1", user_org_id)
+	}).Order("id desc").First(&twenty).Error
+
+	return twenty, 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/doctor_schedule_service.go

@@ -588,7 +588,7 @@ func GetAllMobileZone(orgid int64) (zone []*models.DeviceZone, err error) {
 	return zone, err
 }
 
-func GetPatientSchedule(startime int64, zoneid int64, classtype int64, orgid int64) (schedule []*models.Schedule, err error) {
+func GetPatientSchedule(startime int64, zoneid int64, classtype int64, orgid int64) (schedule []*models.ScheduleTwenty, err error) {
 
 	db := XTReadDB().Table("xt_schedule as s")
 	if zoneid > 0 {
@@ -599,8 +599,8 @@ func GetPatientSchedule(startime int64, zoneid int64, classtype int64, orgid int
 	}
 	err = db.Preload("DeviceZone", " status= 1").Preload("DeviceNumber", func(db *gorm.DB) *gorm.DB {
 		return XTReadDB().Model(&models.DeviceNumber{}).Where("status = 1 AND org_id = ?", orgid).Order("sort asc")
-	}).Preload("DialysisOrder", "status =1").Joins("JOIN xt_patients as p ON p.id = s.patient_id and p.lapseto = 1 and p.user_org_id =?", orgid).Where("s.user_org_id = ? and s.schedule_date = ? and s.status =1", orgid, startime).
-		Select("s.id, s.user_org_id, s.partition_id, s.bed_id, s.patient_id, s.schedule_date, s.schedule_type, s.schedule_week, s.mode_id,p.name as patient").Find(&schedule).Error
+	}).Preload("DialysisOrderTwenty", "status =1").Joins("JOIN xt_patients as p ON p.id = s.patient_id and p.lapseto = 1 and p.user_org_id =?", orgid).Where("s.user_org_id = ? and s.schedule_date = ? and s.status =1", orgid, startime).
+		Select("s.id, s.user_org_id, s.partition_id, s.bed_id, s.patient_id, s.schedule_date, s.schedule_type, s.schedule_week, s.mode_id,s.is_export,p.name as patient").Find(&schedule).Error
 	return schedule, err
 }
 
@@ -741,3 +741,20 @@ func UpdateDialysisPrescriptionOne(prescription models.DialysisPrescription, pat
 	err := XTReadDB().Model(&prescription).Where("patient_id = ? and record_date = ? and status = 1", patientid, recordate).Updates(map[string]interface{}{"dialysis_dialyszers": prescription.DialysisDialyszers, "mode_id": mode_id, "dialysis_irrigation": prescription.DialysisIrrigation}).Error
 	return err
 }
+
+func GetPatientScheduleListByZone(schedule_date int64, class_tye int64, orgid int64) (schedule []*models.ScheduleTwentyOne, err error) {
+
+	db := XTReadDB().Model(&schedule).Where("status = 1")
+
+	if schedule_date > 0 {
+		db = db.Where("schedule_date = ?", schedule_date)
+	}
+	if class_tye > 0 {
+		db = db.Where("schedule_type = ?", class_tye)
+	}
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+	err = db.Select("partition_id,Count(id) as id,user_org_id").Group("partition_id").Scan(&schedule).Error
+	return schedule, err
+}

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

@@ -537,6 +537,22 @@ func GetSettleHisPrescriptionTX(org_id int64, patient_id int64, his_patient_id i
 	return
 }
 
+func GetSettleHisPrescriptionTXOne(org_id int64, patient_id int64, his_patient_id int64, record_date int64, med_type int64, tx *gorm.DB) (prescription []*models.HisPrescription, err error) {
+	err = tx.Model(&models.HisPrescription{}).
+		Preload("HisAdditionalCharge", func(tx *gorm.DB) *gorm.DB {
+			return tx.Where("status = 1 AND user_org_id = ?", org_id).Preload("XtHisAddtionConfig", "status=1")
+		}).
+		Preload("HisDoctorAdviceInfo", func(tx *gorm.DB) *gorm.DB {
+			return tx.Where("status = 1 AND user_org_id = ?", org_id).Group("drug_id").Preload("Drug", "status=1")
+		}).
+		Preload("HisPrescriptionProject", func(tx *gorm.DB) *gorm.DB {
+			return tx.Where("status = 1 AND user_org_id = ?", org_id).Group("project_id").Preload("HisProject").Preload("GoodInfo", "status=1").Preload("XtHisProjectTeam", "status = 1")
+		}).
+		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND order_status <> 2 AND his_patient_id = ? AND p_type <> 1 AND med_type = ?", org_id, record_date, patient_id, his_patient_id, med_type).
+		Find(&prescription).Error
+	return
+}
+
 func GetMonthHisPrescription(org_id int64, patient_id int64, start_date int64, end_date int64, med_type int64) (prescription []*models.HisPrescription, err error) {
 	err = readDb.Model(&models.HisPrescription{}).
 		Preload("HisAdditionalCharge", func(db *gorm.DB) *gorm.DB {
@@ -568,6 +584,22 @@ func GetMonthHisPrescriptionTX(org_id int64, patient_id int64, start_date int64,
 	return
 }
 
+func GetMonthHisPrescriptionTXOne(org_id int64, patient_id int64, start_date int64, end_date int64, med_type int64, tx *gorm.DB) (prescription []*models.HisPrescription, err error) {
+	err = tx.Model(&models.HisPrescription{}).
+		Preload("HisAdditionalCharge", func(tx *gorm.DB) *gorm.DB {
+			return tx.Where("status = 1 AND user_org_id = ?", org_id).Preload("XtHisAddtionConfig", "status=1")
+		}).
+		Preload("HisDoctorAdviceInfo", func(tx *gorm.DB) *gorm.DB {
+			return tx.Where("status = 1 AND user_org_id = ?", org_id).Group("drug_id").Preload("Drug", "status=1")
+		}).
+		Preload("HisPrescriptionProject", func(tx *gorm.DB) *gorm.DB {
+			return tx.Where("status = 1 AND user_org_id = ?", org_id).Group("project_id").Preload("HisProject").Preload("GoodInfo", "status=1").Preload("XtHisProjectTeam", "status = 1")
+		}).
+		Where("user_org_id = ? AND status = 1 AND record_date >= ? AND record_date <= ? AND patient_id = ? AND order_status <> 2 AND p_type <> 1 AND med_type = ?", org_id, start_date, end_date, patient_id, med_type).
+		Find(&prescription).Error
+	return
+}
+
 func GetMonthHisPrescriptionTwo(org_id int64, patient_id int64, start_date int64, end_date int64, p_type int64) (prescription []*models.HisPrescription, err error) {
 	err = readDb.Model(&models.HisPrescription{}).
 		Preload("HisAdditionalCharge", func(db *gorm.DB) *gorm.DB {
@@ -2392,6 +2424,25 @@ func GetPrescriptionByIdsTX(ids []string, org_id int64, tx *gorm.DB) (prescripti
 	return
 }
 
+func GetPrescriptionByIdsTxOne(ids []string, org_id int64, tx *gorm.DB) (prescription []*models.HisPrescription, err error) {
+	err = tx.Model(&models.HisPrescription{}).
+		Preload("HisAdditionalCharge", func(tx *gorm.DB) *gorm.DB {
+			return tx.Where("status = 1 AND user_org_id = ?", org_id).Preload("XtHisAddtionConfig", "status=1")
+		}).
+		Preload("HisDoctorAdviceInfo", func(tx *gorm.DB) *gorm.DB {
+			return tx.Where("status = 1 AND user_org_id = ?", org_id).Group("drug_id").Preload("Drug", "status=1")
+		}).
+		Preload("HisPrescriptionProject", func(tx *gorm.DB) *gorm.DB {
+			return tx.Where("status = 1 AND user_org_id = ?", org_id).Group("project_id").Preload("HisProject").Preload("GoodInfo", "status=1")
+		}).Preload("TempHisOrder", func(tx *gorm.DB) *gorm.DB {
+		return tx.Where("status = 1 AND user_org_id = ?", org_id)
+	}).
+		Where("id in (?) AND user_org_id = ? AND status = 1", ids, org_id).
+		Find(&prescription).Error
+
+	return
+}
+
 func GetNewAllUnChargeHisPatientListTwo(org_id int64, keywords string, record_date int64) (patients []*NewTempPatients, err error) {
 	db := readDb.Model(&NewTempPatients{}).Where("xt_patients.user_org_id = ? AND xt_patients.status = 1", org_id)
 	db = db.Preload("HisPatient", func(db *gorm.DB) *gorm.DB {
@@ -2590,3 +2641,67 @@ 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
+}
+
+func GetDrugSumOutCountByDrugId(drug_id int64, user_org_id int64) (models.XtDrugStockCount, error) {
+
+	drug := models.XtDrugStockCount{}
+
+	err := XTReadDB().Where("drug_id = ? and user_org_id = ? and status = 1", drug_id, user_org_id).Find(&drug).Error
+
+	return drug, err
+}
+
+func GetStockGoodList(good_id int64, org_id int64) (models.XtGoodStockCount, error) {
+
+	stockCount := models.XtGoodStockCount{}
+	err = XTReadDB().Where("good_id = ? and user_org_id = ? and status= 1", good_id, org_id).Find(&stockCount).Error
+	return stockCount, err
+}

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/manage_service.go

@@ -914,19 +914,10 @@ func GetAllpatient(orgid int64) (patients []*models.Patients, err error) {
 	return patients, err
 }
 
-//func GetInformation(id int64, orgid int64) (*models.DeviceInformation, error) {
-////	var information models.DeviceInformation
-////	var err error
-////	err = UserReadDB().Model(&information).Where("id = ? and user_org_id = ? and status = ?", id, orgid, 1).Find(&information).Error
-////	fmt.Print("", err)
-////	if err == gorm.ErrRecordNotFound {
-////		return nil, err
-////	}
-////	if err != nil {
-////		return nil, err
-////	}
-////	return &information, nil
-////}
+func GetAllpatientThirty(orgid int64) (patients []*models.PatientsThirty, err error) {
+	err = XTReadDB().Where("user_org_id = ? and status = 1", orgid).Find(&patients).Error
+	return patients, err
+}
 
 func GetInformation(eid int64, startdate int64, orgid int64, classtype int64) (*models.DeviceInformation, error) {
 	var information models.DeviceInformation

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

@@ -1308,22 +1308,22 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 	// 将该批次的剩余库存数量转换为拆零数量
 	// 将该批次的剩余库存数量转换为拆零数量
 	if warehouse.MaxUnit == drup.MaxUnit && drup.MaxUnit != drup.MinUnit {
-		fmt.Println("进来1")
+		//fmt.Println("进来1")
 		stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
-		fmt.Println("剩余库存1", stock_number)
+		//fmt.Println("剩余库存1", stock_number)
 	}
 	if warehouse.MaxUnit == drup.MinUnit && drup.MaxUnit != drup.MinUnit {
-		fmt.Println("进来2")
+		//fmt.Println("进来2")
 		stock_number = warehouse.StockMaxNumber + warehouse.StockMinNumber
-		fmt.Println("剩余库存2", stock_number)
+		//fmt.Println("剩余库存2", stock_number)
 	}
 	if warehouse.MaxUnit == drup.MaxUnit && drup.MaxUnit == drup.MinUnit {
-		fmt.Println("进来3")
+		//fmt.Println("进来3")
 		stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
-		fmt.Println("剩余库存3", stock_number)
+		//fmt.Println("剩余库存3", stock_number)
 	}
-	fmt.Println("剩余库存23333333333333333333333333333wo", stock_number)
-	fmt.Println("出库数量2333333333333333333333333333333333333wo", deliver_number)
+	//fmt.Println("剩余库存23333333333333333333333333333wo", stock_number)
+	//fmt.Println("出库数量2333333333333333333333333333333333333wo", deliver_number)
 
 	// 当库存数量大于或等于出库数量的话，则正常出库该批次
 	if stock_number >= deliver_number {
@@ -1366,10 +1366,13 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 		fmt.Println("minnU目标而332322323323233223323223我", minNumber)
 		fmt.Println("max_number232232332232322wo", maxNumber)
 		fmt.Println(" warehouse.StockMinNumber", warehouse.StockMinNumber)
+
 		if warehouse.StockMinNumber < minNumber {
 
 			warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
-			warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
+			if warehouse.MaxUnit != warehouse.MinUnit {
+				warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
+			}
 		} else {
 			if minNumber > 0 {
 				if (warehouse.StockMinNumber - minNumber) >= 0 {
@@ -1838,6 +1841,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

@@ -221,44 +221,50 @@ func GetAllAdvicestByList(orgID int64, scheduleDate int64) (advices []models.VMD
 }
 
 func GetAllPrescriptionsByList(orgID int64, scheduleDate int64) (prescriptions []*models.DialysisPrescriptionList, err error) {
-	redis := RedisClient()
-	defer redis.Close()
-	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":prescriptions_list_all"
-	prescriptions_list_all, _ := redis.Get(key).Result()
-
-	if len(prescriptions_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Where("status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).Find(&prescriptions).Error
-		if err != nil {
-			if err == gorm.ErrRecordNotFound {
-				if len(prescriptions) <= 0 {
-					redis.Set(key, "null", time.Second*60*60*18)
-				}
-				return nil, nil
-			} else {
-				return nil, err
-			}
-		} else {
-			if len(prescriptions) > 0 {
-				//缓存数据
-				prescriptions_list_all, err := json.Marshal(&prescriptions)
-				if err == nil {
-					redis.Set(key, prescriptions_list_all, time.Second*60*60*18)
-				}
-			} else {
-				redis.Set(key, "null", time.Second*60*60*18)
-			}
-			return prescriptions, nil
-		}
-	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		if prescriptions_list_all == "null" {
-			return nil, nil
-		} else {
-			json.Unmarshal([]byte(prescriptions_list_all), &prescriptions)
-			return prescriptions, nil
-		}
 
-	}
-}
+	err = readDb.Where("status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).Find(&prescriptions).Error
+	return prescriptions, err
+}
+
+//func GetAllPrescriptionsByList(orgID int64, scheduleDate int64) (prescriptions []*models.DialysisPrescriptionList, err error) {
+//	redis := RedisClient()
+//	defer redis.Close()
+//	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":prescriptions_list_all"
+//	prescriptions_list_all, _ := redis.Get(key).Result()
+//  redis.Set(prescriptions_list_all, "", time.Second)
+//	if len(prescriptions_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+//		err = readDb.Where("status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).Find(&prescriptions).Error
+//		if err != nil {
+//			if err == gorm.ErrRecordNotFound {
+//				if len(prescriptions) <= 0 {
+//					redis.Set(key, "null", time.Second*60*60*18)
+//				}
+//				return nil, nil
+//			} else {
+//				return nil, err
+//			}
+//		} else {
+//			if len(prescriptions) > 0 {
+//				//缓存数据
+//				prescriptions_list_all, err := json.Marshal(&prescriptions)
+//				if err == nil {
+//					redis.Set(key, prescriptions_list_all, time.Second*60*60*18)
+//				}
+//			} else {
+//				redis.Set(key, "null", time.Second*60*60*18)
+//			}
+//			return prescriptions, nil
+//		}
+//	} else { //缓存数据了数据，将redis缓存的json字符串转为map
+//		if prescriptions_list_all == "null" {
+//			return nil, nil
+//		} else {
+//			json.Unmarshal([]byte(prescriptions_list_all), &prescriptions)
+//			return prescriptions, nil
+//		}
+//
+//	}
+//}
 
 func GetAllAssessmentBeforesByList(orgID int64, scheduleDate int64) (assessmentBefores []*models.PredialysisEvaluationList, err error) {
 	redis := RedisClient()
@@ -300,43 +306,49 @@ func GetAllAssessmentBeforesByList(orgID int64, scheduleDate int64) (assessmentB
 }
 
 func GetAllDialysisOrdersByList(orgID int64, scheduleDate int64) (dialysisOrders []*models.MDialysisOrderForList, err error) {
-	redis := RedisClient()
-	defer redis.Close()
-	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":dialysis_orders_list_all"
-	dialysis_orders_list_all, _ := redis.Get(key).Result()
-	redis.Set(dialysis_orders_list_all, "", time.Second)
-	if len(dialysis_orders_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Model(&models.MDialysisOrderForList{}).Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Find(&dialysisOrders).Error
-
-		if err != nil {
-			if err == gorm.ErrRecordNotFound {
-				return nil, nil
-			} else {
-				return nil, err
-			}
-		} else {
-			if len(dialysisOrders) > 0 {
-				//缓存数据
-				dialysis_orders_list_all, err := json.Marshal(&dialysisOrders)
-				if err == nil {
-					redis.Set(key, dialysis_orders_list_all, time.Second*60*60*18)
-				}
-			} else {
-				redis.Set(key, "null", time.Second*60*60*18)
-			}
-			return dialysisOrders, nil
-		}
-	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		if dialysis_orders_list_all == "null" {
-			return nil, nil
-		} else {
-			json.Unmarshal([]byte(dialysis_orders_list_all), &dialysisOrders)
-			return dialysisOrders, nil
-		}
 
-	}
+	err = readDb.Model(&models.MDialysisOrderForList{}).Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Find(&dialysisOrders).Error
+	return dialysisOrders, err
 }
 
+//func GetAllDialysisOrdersByList(orgID int64, scheduleDate int64) (dialysisOrders []*models.MDialysisOrderForList, err error) {
+//	redis := RedisClient()
+//	defer redis.Close()
+//	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":dialysis_orders_list_all"
+//	dialysis_orders_list_all, _ := redis.Get(key).Result()
+//	redis.Set(dialysis_orders_list_all, "", time.Second)
+//	if len(dialysis_orders_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+//		err = readDb.Model(&models.MDialysisOrderForList{}).Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Find(&dialysisOrders).Error
+//
+//		if err != nil {
+//			if err == gorm.ErrRecordNotFound {
+//				return nil, nil
+//			} else {
+//				return nil, err
+//			}
+//		} else {
+//			if len(dialysisOrders) > 0 {
+//				//缓存数据
+//				dialysis_orders_list_all, err := json.Marshal(&dialysisOrders)
+//				if err == nil {
+//					redis.Set(key, dialysis_orders_list_all, time.Second*60*60*18)
+//				}
+//			} else {
+//				redis.Set(key, "null", time.Second*60*60*18)
+//			}
+//			return dialysisOrders, nil
+//		}
+//	} else { //缓存数据了数据，将redis缓存的json字符串转为map
+//		if dialysis_orders_list_all == "null" {
+//			return nil, nil
+//		} else {
+//			json.Unmarshal([]byte(dialysis_orders_list_all), &dialysisOrders)
+//			return dialysisOrders, nil
+//		}
+//
+//	}
+//}
+
 func GetAllTreatmentSummarysByList(orgID int64, scheduleDate int64) (treatmentSummarys []*models.VMTreatmentSummaryForList, err error) {
 	redis := RedisClient()
 	defer redis.Close()
@@ -416,6 +428,12 @@ func GetAllAssessmentAfterDislysisByList(orgID int64, scheduleDate int64) (asses
 	}
 }
 
+func GetAllDobuleCheckList(orgID int64, scheduleDate int64) (dobulecheck []*models.DoubleCheck, err error) {
+
+	err = XTReadDB().Where("check_date = ? and user_org_id = ? and status = 1", scheduleDate, orgID).Find(&dobulecheck).Error
+	return dobulecheck, err
+}
+
 func GetAllHisAdvicesByList(orgID int64, scheduleDate int64) (hisAdvices []VMHisDoctorAdviceInfo, err error) {
 	redis := RedisClient()
 	defer redis.Close()
@@ -539,9 +557,8 @@ func FindPatientByIdWithDiseases(orgID int64, id int64) (patient models.Patients
 	redis := RedisClient()
 	defer redis.Close()
 	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(id, 10) + ":patient_info"
-
 	patient_info_str, _ := redis.Get(key).Result()
-	fmt.Println("patient_info_stre223322323232323323223", patient_info_str)
+
 	if len(patient_info_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		err = readDb.Model(&models.Patients{}).Preload("Contagions", "status = 1").Preload("Diseases", "status = 1").Where("id = ? and user_org_id=? and status=1", id, orgID).First(&patient).Error
 		if err != nil {
@@ -830,7 +847,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
 }
 
@@ -1378,7 +1395,7 @@ func GetPatientDialysisRecord(orgID, patientID int64, page, limit, start, end, m
 		Preload("TreatmentSummary", "patient_id=? and user_org_id=? and status=1", patientID, orgID).
 		Preload("Device", "org_id=? and status=1", orgID).
 		Preload("UserAdminRole", func(db *gorm.DB) *gorm.DB {
-			return readUserDb.Where("org_id=? and status = 1", orgID)
+			return readUserDb.Where("org_id=?", orgID)
 		}).
 		Joins("JOIN xt_schedule as s ON s.patient_id=? and FROM_UNIXTIME(s.schedule_date, '%Y-%m-%d')=FROM_UNIXTIME(do.dialysis_date, '%Y-%m-%d')", patientID).
 		Joins("JOIN xt_device_zone as dz ON dz.org_id = ? and dz.id=s.partition_id", orgID).
@@ -2268,6 +2285,11 @@ func GetAllDialysisOrdersByListTwo(orgID int64, scheduleDate int64) (dialysisOrd
 	key := strconv.FormatInt(orgID, 10) + ":" + ":dialysis_orders_list_all"
 	dialysis_orders_list_all, _ := redis.Get(key).Result()
 
+	if scheduleDate < 1669132800 {
+		fmt.Println("key233232232332323232", key)
+		redis.Set(key, "", time.Second)
+	}
+	fmt.Println("dialysis_orders_list_all", dialysis_orders_list_all)
 	if len(dialysis_orders_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		err = readDb.Model(&MDialysisOrderVM{}).Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Find(&dialysisOrders).Error
 		if err != nil {
@@ -2322,6 +2344,12 @@ func GetAllZoneByList(orgID int64) (zone []*models.DeviceZone, err error) {
 	}
 }
 
+func GetAllDialysisOrdersByListSeven(orgID int64, scheduleDate int64) (dialysisOrders []*MDialysisOrderVM, err error) {
+
+	err = readDb.Model(&MDialysisOrderVM{}).Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Find(&dialysisOrders).Error
+	return dialysisOrders, err
+}
+
 func GetAllPrescriptionByList(orgID int64, scheduleDate int64) (prescriptions []*models.VMDialysisPrescription, err error) {
 
 	redis := RedisClient()
@@ -2459,7 +2487,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
@@ -2608,7 +2636,7 @@ func GetAllDeviceNumberByListOne(orgID int64) (number []*MDeviceNumberVM, err er
 	}
 }
 
-func GetAllPrescriptionByListOne(orgID int64, scheduleDate int64) (prescriptions []*models.DialysisPrescriptionList, err error) {
+func GetAllPrescriptionByListOne(orgID int64, scheduleDate int64) (prescriptions []*models.DialysisPrescriptionTwenty, err error) {
 
 	redis := RedisClient()
 	defer redis.Close()
@@ -2617,7 +2645,7 @@ func GetAllPrescriptionByListOne(orgID int64, scheduleDate int64) (prescriptions
 	prescriptions_list_all, _ := redis.Get(key).Result()
 
 	if len(prescriptions_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Model(&models.DialysisPrescriptionList{}).Where("status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).Find(&prescriptions).Error
+		err = readDb.Model(&models.DialysisPrescriptionTwenty{}).Where("status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).Find(&prescriptions).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
 				return nil, nil
@@ -2645,6 +2673,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")
@@ -2676,6 +2717,12 @@ func GetDialysisSolutionDetailList(orgid int64, patient_id int64, mode_id int64,
 	return solution, total, err
 }
 
+func UpdateDialysisBefor(dislysis models.XtAssessmentBeforeDislysis, id int64) error {
+
+	err := XTWriteDB().Model(&models.XtAssessmentBeforeDislysis{}).Where("id = ? and status= 1", id).Update(map[string]interface{}{"systolic_blood_pressure": dislysis.SystolicBloodPressure, "diastolic_blood_pressure": dislysis.DiastolicBloodPressure}).Error
+	return err
+}
+
 func GetAllSchedulesByPatientInfo(org_id int64, patient_id int64, mode_id int64) ([]Schedule, error) {
 	var record []Schedule
 	loc, _ := time.LoadLocation("Local")

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -102,6 +102,7 @@ type DialysisOrderVM struct {
 	FinishModifier int64           `gorm:"column:finish_modifier" json:"finish_modifier"`
 	SchedualType   int64           `gorm:"column:schedual_type" json:"schedual_type"`
 	WashpipeNurse  int64           `gorm:"column:washpipe_nurse" json:"washpipe_nurse" form:"washpipe_nurse"`
+	UserOrgId      int64           `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
 }
 
 func (DialysisOrderVM) TableName() string {
@@ -203,7 +204,7 @@ type PrescriptionVM struct {
 	ReplacementFlow            string  `gorm:"column:replacement_flow" json:"replacement_flow" form:"replacement_flow"`
 	PlasmaSeparator            string  `gorm:"column:plasma_separator" json:"plasma_separator" form:"plasma_separator"`
 	BilirubinAdsorptionColumn  string  `gorm:"column:bilirubin_adsorption_column" json:"bilirubin_adsorption_column" form:"bilirubin_adsorption_column"`
-
+	UserOrgId                  int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
 	HemodialysisPipelines      string  `gorm:"column:hemodialysis_pipelines" json:"hemodialysis_pipelines" form:"hemodialysis_pipelines"`
 	HemodialysisPipelinesCount float64 `gorm:"column:hemodialysis_pipelines_count" json:"hemodialysis_pipelines_count" form:"hemodialysis_pipelines_count"`
 	PunctureNeedle             string  `gorm:"column:puncture_needle" json:"puncture_needle" form:"puncture_needle"`
@@ -288,6 +289,7 @@ type AssessmentBeforeDislysisVM struct {
 	PreDialysisDrugs               string  `gorm:"column:pre_dialysis_drugs" json:"pre_dialysis_drugs" form:"pre_dialysis_drugs"`
 	Period                         int64   `gorm:"column:period" json:"period" form:"period"`
 	EstimatedFoodIntake            string  `gorm:"column:estimated_food_intake" json:"estimated_food_intake" form:"estimated_food_intake"`
+	UserOrgId                      int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
 }
 
 func (AssessmentBeforeDislysisVM) TableName() string {
@@ -370,6 +372,7 @@ type AssessmentAfterDislysisVM struct {
 	Lapse                           int64   `gorm:"column:lapse" json:"lapse" form:"lapse"`
 	Consciousness                   int64   `gorm:"column:consciousness" json:"consciousness" form:"consciousness"`
 	Fallrisk                        int64   `gorm:"column:fallrisk" json:"fallrisk" form:"fallrisk"`
+	UserOrgId                       int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
 }
 
 func (AssessmentAfterDislysisVM) TableName() string {
@@ -436,6 +439,7 @@ type XtAssessmentAfterDislysisVM struct {
 	CvcA                            float64 `gorm:"column:cvc_a" json:"cvc_a" form:"cvc_a"`
 	CvcV                            float64 `gorm:"column:cvc_v" json:"cvc_v" form:"cvc_v"`
 	Channel                         int64   `gorm:"column:channel" json:"channel" form:"channel"`
+	UserOrgId                       int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
 }
 
 func (XtAssessmentAfterDislysisVM) TableName() string {
@@ -464,6 +468,7 @@ type ReceiveAssessmentVM struct {
 	PsychologicalOther           string `gorm:"column:psychological_other" json:"psychological_other"`
 	IsPrecaution                 int64  `gorm:"column:is_precaution" json:"is_precaution"`
 	AdmissionNumber              string `gorm:"column:admission_number" json:"admission_number" form:"admission_number"`
+	UserOrgId                    int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
 }
 
 func (ReceiveAssessmentVM) TableName() string {
@@ -547,6 +552,7 @@ type MonitoringRecordVM struct {
 	BloodThickness              float64 `gorm:"column:blood_thickness" json:"blood_thickness" form:"blood_thickness"`
 	BloodMonitor                float64 `gorm:"column:blood_monitor" json:"blood_monitor" form:"blood_monitor"`
 	BloodPressureMonitoringSite int64   `gorm:"column:blood_pressure_monitoring_site" json:"blood_pressure_monitoring_site" form:"blood_pressure_monitoring_site"`
+	UserOrgId                   int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
 }
 
 func (MonitoringRecordVM) TableName() string {
@@ -757,3 +763,140 @@ type SummerVM struct {
 func (SummerVM) TableName() string {
 	return "xt_treatment_summary"
 }
+
+type PatientVMOne 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"`
+	UserId                    int64  `gorm:"column:user_id" json:"user_id" form:"user_id"`
+	Avatar                    string `gorm:"column:avatar" json:"avatar" form:"avatar"`
+	PatientType               int64  `gorm:"column:patient_type" json:"patient_type" form:"patient_type"`
+	DialysisNo                string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
+	AdmissionNumber           string `gorm:"column:admission_number" json:"admission_number" form:"admission_number"`
+	Source                    int64  `gorm:"column:source" json:"source" form:"source"`
+	Lapseto                   int64  `gorm:"column:lapseto" json:"lapseto" form:"lapseto"`
+	PartitionId               int64  `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
+	BedId                     int64  `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	Name                      string `gorm:"column:name" json:"name" form:"name"`
+	Alias                     string `gorm:"column:alias" json:"alias" form:"alias"`
+	Gender                    int64  `gorm:"column:gender" json:"gender" form:"gender"`
+	Nation                    string `gorm:"column:nation" json:"nation" form:"nation"`
+	NativePlace               string `gorm:"column:native_place" json:"native_place" form:"native_place"`
+	IdCardNo                  string `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	Birthday                  int64  `gorm:"column:birthday" json:"birthday" form:"birthday"`
+	Height                    int64  `gorm:"column:height" json:"height" form:"height"`
+	Rh                        int64  `gorm:"column:rh" json:"rh" form:"rh"`
+	HealthCareDueAlertDate    int64  `gorm:"column:health_care_due_alert_date" json:"health_care_due_alert_date" form:"health_care_due_alert_date"`
+	Phone                     string `gorm:"column:phone" json:"phone" form:"phone"`
+	HomeTelephone             string `gorm:"column:home_telephone" json:"home_telephone" form:"home_telephone"`
+	RelativePhone             string `gorm:"column:relative_phone" json:"relative_phone" form:"relative_phone"`
+	RelativeRelations         string `gorm:"column:relative_relations" json:"relative_relations" form:"relative_relations"`
+	HomeAddress               string `gorm:"column:home_address" json:"home_address" form:"home_address"`
+	WorkUnit                  string `gorm:"column:work_unit" json:"work_unit" form:"work_unit"`
+	UnitAddress               string `gorm:"column:unit_address" json:"unit_address" form:"unit_address"`
+	ReceivingDate             int64  `gorm:"column:receiving_date" json:"receiving_date" form:"receiving_date"`
+	IsHospitalFirstDialysis   int64  `gorm:"column:is_hospital_first_dialysis" json:"is_hospital_first_dialysis" form:"is_hospital_first_dialysis"`
+	FirstDialysisDate         int64  `gorm:"column:first_dialysis_date" json:"first_dialysis_date" form:"first_dialysis_date"`
+	FirstDialysisHospital     string `gorm:"column:first_dialysis_hospital" json:"first_dialysis_hospital" form:"first_dialysis_hospital"`
+	PredialysisCondition      string `gorm:"column:predialysis_condition" json:"predialysis_condition" form:"predialysis_condition"`
+	HospitalFirstDialysisDate int64  `gorm:"column:hospital_first_dialysis_date" json:"hospital_first_dialysis_date" form:"hospital_first_dialysis_date"`
+	TotalDialysis             int64  `gorm:"column:total_dialysis" json:"total_dialysis" form:"total_dialysis"`
+	Diagnose                  string `gorm:"column:diagnose" json:"diagnose" form:"diagnose"`
+	Remark                    string `gorm:"column:remark" json:"remark" form:"remark"`
+	PatientComplains          string `gorm:"column:patient_complains" json:"patient_complains"` // 主诉
+	PresentHistory            string `gorm:"column:present_history" json:"present_history"`     // 现病史
+	PastHistory               string `gorm:"column:past_history" json:"past_history"`           // 既往史
+	Status                    int64  `gorm:"column:status" json:"status" form:"status"`
+	Age                       int64  `gorm:"column:age" json:"age"`
+	DialysisAge               int64  `gorm:"column:dialysis_age" json:"dialysis_age" form:"dialysis_age"`
+	TellPhone                 string `gorm:"column:tell_phone" json:"tell_phone" form:"tell_phone"`
+	FirstTreatmentDate        int64  `gorm:"column:first_treatment_date" json:"first_treatment_date" form:"first_treatment_date"`
+	UserSysBeforeCount        int64  `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
+}
+
+func (PatientVMOne) TableName() string {
+	return "xt_patients"
+}
+
+type ScheduleVMSix struct {
+	ID                       int64                       `gorm:"column:id" json:"id"`
+	PatientID                int64                       `gorm:"column:patient_id" json:"patient_id"`
+	ScheduleDate             int64                       `gorm:"column:schedule_date" json:"schedule_date"`
+	BedID                    int64                       `gorm:"column:bed_id" json:"bed_id"`
+	PartitionId              int64                       `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
+	Patient                  *PatientVMSix               `gorm:"ForeignKey:PatientID" json:"patient"`
+	DialysisOrder            DialysisOrderVM             `gorm:"ForeignKey:DialysisDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"dialysis_order"`
+	Prescription             PrescriptionVM              `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"prescription"`
+	ReceiveAssessment        ReceiveAssessmentVM         `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"receive_assessment"`
+	XtReceiveTreatmentAsses  *XtReceiveTreatmentAsses    `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"xt_receive_assessment"`
+	AssessmentBeforeDislysis AssessmentBeforeDislysisVM  `gorm:"ForeignKey:AssessmentDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"assessment_before_dislysis"`
+	AssessmentAfterDislysis  AssessmentAfterDislysisVM   `gorm:"ForeignKey:AssessmentDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"assessment_after_dislysis"`
+	MonitoringRecords        []*MonitoringRecordVM       `gorm:"ForeignKey:MonitoringDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"monitor_records"`
+	DeviceNumber             *DeviceNumberVM             `gorm:"ForeignKey:BedID" json:"device_number"`
+	DeviceZone               *DeviceZoneVM               `gorm:"ForeignKey:PartitionId" json:"device_zone"`
+	Advices                  []*DoctorAdviceVM           `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientId" json:"advices"`
+	DoubleCheck              *DoubleCheckVM              `gorm:"ForeignKey:CheckDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"check"`
+	Summer                   *SummerVM                   `gorm:"ForeignKey:AssessmentDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"summer"`
+	LastAfterWeight          XtAssessmentAfterDislysisVM `gorm:"ForeignKey:PatientID;AssociationForeignKey:PatientID" json:"lastafterweight"`
+	Count                    int64
+}
+
+func (ScheduleVMSix) TableName() string {
+	return "xt_schedule"
+}
+
+type PatientVMSix 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"`
+	UserId                    int64  `gorm:"column:user_id" json:"user_id" form:"user_id"`
+	Avatar                    string `gorm:"column:avatar" json:"avatar" form:"avatar"`
+	PatientType               int64  `gorm:"column:patient_type" json:"patient_type" form:"patient_type"`
+	DialysisNo                string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
+	AdmissionNumber           string `gorm:"column:admission_number" json:"admission_number" form:"admission_number"`
+	Source                    int64  `gorm:"column:source" json:"source" form:"source"`
+	Lapseto                   int64  `gorm:"column:lapseto" json:"lapseto" form:"lapseto"`
+	PartitionId               int64  `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
+	BedId                     int64  `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	Name                      string `gorm:"column:name" json:"name" form:"name"`
+	Alias                     string `gorm:"column:alias" json:"alias" form:"alias"`
+	Gender                    int64  `gorm:"column:gender" json:"gender" form:"gender"`
+	Nation                    string `gorm:"column:nation" json:"nation" form:"nation"`
+	IdCardNo                  string `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	Birthday                  int64  `gorm:"column:birthday" json:"birthday" form:"birthday"`
+	Height                    int64  `gorm:"column:height" json:"height" form:"height"`
+	EducationLevel            int64  `gorm:"column:education_level" json:"education_level" form:"education_level"`
+	Profession                int64  `gorm:"column:profession" json:"profession" form:"profession"`
+	Phone                     string `gorm:"column:phone" json:"phone" form:"phone"`
+	HomeTelephone             string `gorm:"column:home_telephone" json:"home_telephone" form:"home_telephone"`
+	RelativePhone             string `gorm:"column:relative_phone" json:"relative_phone" form:"relative_phone"`
+	RelativeRelations         string `gorm:"column:relative_relations" json:"relative_relations" form:"relative_relations"`
+	HomeAddress               string `gorm:"column:home_address" json:"home_address" form:"home_address"`
+	WorkUnit                  string `gorm:"column:work_unit" json:"work_unit" form:"work_unit"`
+	UnitAddress               string `gorm:"column:unit_address" json:"unit_address" form:"unit_address"`
+	Children                  int64  `gorm:"column:children" json:"children" form:"children"`
+	IsHospitalFirstDialysis   int64  `gorm:"column:is_hospital_first_dialysis" json:"is_hospital_first_dialysis" form:"is_hospital_first_dialysis"`
+	FirstDialysisDate         int64  `gorm:"column:first_dialysis_date" json:"first_dialysis_date" form:"first_dialysis_date"`
+	FirstDialysisHospital     string `gorm:"column:first_dialysis_hospital" json:"first_dialysis_hospital" form:"first_dialysis_hospital"`
+	PredialysisCondition      string `gorm:"column:predialysis_condition" json:"predialysis_condition" form:"predialysis_condition"`
+	HospitalFirstDialysisDate int64  `gorm:"column:hospital_first_dialysis_date" json:"hospital_first_dialysis_date" form:"hospital_first_dialysis_date"`
+	TotalDialysis             int64  `gorm:"column:total_dialysis" json:"total_dialysis" form:"total_dialysis"`
+	Evaluate                  string `gorm:"column:evaluate" json:"evaluate" form:"evaluate"`
+	Diagnose                  string `gorm:"column:diagnose" json:"diagnose" form:"diagnose"`
+	Remark                    string `gorm:"column:remark" json:"remark" form:"remark"`
+	RegistrarsId              int64  `gorm:"column:registrars_id" json:"registrars_id" form:"registrars_id"`
+	Registrars                string `gorm:"column:registrars" json:"registrars" form:"registrars"`
+	PatientComplains          string `gorm:"column:patient_complains" json:"patient_complains"` // 主诉
+	PresentHistory            string `gorm:"column:present_history" json:"present_history"`     // 现病史
+	PastHistory               string `gorm:"column:past_history" json:"past_history"`           // 既往史
+	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"`
+	Age                       int64  `gorm:"column:age" json:"age"`
+	DialysisAge               int64  `gorm:"column:dialysis_age" json:"dialysis_age" form:"dialysis_age"`
+	TellPhone                 string `gorm:"column:tell_phone" json:"tell_phone" form:"tell_phone"`
+	FirstTreatmentDate        int64  `gorm:"column:first_treatment_date" json:"first_treatment_date" form:"first_treatment_date"`
+	UserSysBeforeCount        int64  `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
+}
+
+func (PatientVMSix) TableName() string {
+	return "xt_patients"
+}

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -321,3 +321,137 @@ func GetWarehouseCancelPrintList(orgid int64, startime int64, endtime int64) (ca
 	err = db.Select("x.ctime,x.good_id,sum(x.count) as count,t.good_name,t.specification_name,t.packing_unit,t.retail_price,t.packing_price").Joins("left join xt_good_information as t on t.id = x.good_id").Group("x.good_id").Scan(&cancel).Error
 	return cancel, err
 }
+
+func GetSchedulesSeven(orgID int64, schIDs []string) ([]*ScheduleVMSix, error) {
+	//recordDateStr := time.Now().Format("2006-01-02")
+	//recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
+	var schedules []*ScheduleVMSix
+	db := p_service.XTReadDB()
+	err := db.Model(&ScheduleVMSix{}).
+		Preload("Patient", "user_org_id = ? AND status = 1", orgID).
+		Preload("DeviceNumber", "org_id = ?", orgID).
+		Preload("DeviceZone", "org_id = ?", orgID).
+		Where("user_org_id = ? AND status = 1 AND id in (?)", orgID, schIDs).Order("schedule_date asc").
+		Find(&schedules).
+		Error
+	if err != nil {
+		return nil, err
+	}
+	for _, item := range schedules {
+		dialysis_count, _ := GetDialysisOrderCount(orgID, item.PatientID, item.ScheduleDate)
+		item.Patient.TotalDialysis = dialysis_count
+	}
+	return schedules, nil
+}
+
+func GetSchedulesSix(orgID int64, schIDs []string) ([]*ScheduleVMSix, error) {
+	recordDateStr := time.Now().Format("2006-01-02")
+	recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
+	var schedules []*ScheduleVMSix
+	db := p_service.XTReadDB()
+	err := db.Model(&ScheduleVMSix{}).
+		Preload("Patient", "user_org_id = ? AND status = 1", orgID).
+		Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+			return db.Where("user_org_id = ? AND status = 1", orgID).Preload("DeviceNumber", "org_id = ? AND status = 1", orgID)
+		}).
+		Preload("Prescription", "user_org_id = ? AND status = 1", orgID).
+		Preload("ReceiveAssessment", "user_org_id = ? AND status = 1", orgID).
+		Preload("XtReceiveTreatmentAsses", "user_org_id = ? AND status = 1", orgID).
+		Preload("AssessmentBeforeDislysis", func(db *gorm.DB) *gorm.DB {
+			return db.Where("user_org_id = ? AND status = 1", orgID)
+		}).
+		Preload("AssessmentAfterDislysis", "user_org_id = ? AND status = 1", orgID).
+		Preload("LastAfterWeight", func(db *gorm.DB) *gorm.DB {
+			return db.Where("user_org_id = ? and status = 1 and assessment_date < ?", orgID, recordDate.Unix())
+		}).Preload("MonitoringRecords", func(db *gorm.DB) *gorm.DB {
+		return db.Where("user_org_id = ? AND status = 1", orgID).
+			Order("operate_time asc")
+	}).
+		Preload("DeviceNumber", "org_id = ?", orgID).
+		Preload("DeviceZone", "org_id = ?", orgID).
+		Preload("DoubleCheck", "user_org_id = ? AND status = 1", orgID).
+		Preload("Summer", "user_org_id = ? AND status = 1", orgID).
+		Preload("Advices", func(db *gorm.DB) *gorm.DB {
+			return db.Select("id, user_org_id, patient_id, advice_type, advice_date, record_date, start_time, drug_spec_unit,advice_name,advice_desc, reminder_date, drug_spec, drug_spec_unit, single_dose, single_dose_unit, prescribing_number, prescribing_number_unit, delivery_way, execution_frequency, advice_doctor, status, created_time,updated_time, advice_affirm, remark, stop_time, stop_reason, stop_doctor, stop_state, parent_id, execution_time, execution_staff, execution_state, checker, check_state, check_time, groupno, IF(parent_id > 0, parent_id, id) as advice_order").
+				Where("user_org_id = ? AND advice_type = 2 AND status = 1", orgID).
+				Order("start_time asc, groupno desc, advice_order desc, id asc")
+		}).Where("user_org_id = ? AND status = 1 AND id in (?)", orgID, schIDs).Order("schedule_date asc").
+		Find(&schedules).
+		Error
+	if err != nil {
+		return nil, err
+	}
+	for _, item := range schedules {
+		dialysis_count, _ := GetDialysisOrderCount(orgID, item.PatientID, item.ScheduleDate)
+		item.Patient.TotalDialysis = dialysis_count
+	}
+	return schedules, nil
+}
+
+func GetBatchDialysisOrder(orgid int64, patient_id int64, dialysis_date int64) (DialysisOrderVM, error) {
+
+	orderVM := DialysisOrderVM{}
+	err := p_service.XTReadDB().Where("user_org_id = ? and patient_id = ? and dialysis_date = ? and status = 1", orgid, patient_id, dialysis_date).Preload("DeviceNumber", "org_id = ? AND status = 1", orgid).Find(&orderVM).Error
+	return orderVM, err
+}
+
+func GetBatchPrescription(orgid int64, patient_id int64, record_date int64) (PrescriptionVM, error) {
+
+	prescriptionVM := PrescriptionVM{}
+	err := p_service.XTReadDB().Where("user_org_id = ? and patient_id = ? and record_date = ? and status = 1", orgid, patient_id, record_date).Find(&prescriptionVM).Error
+	return prescriptionVM, err
+}
+
+func GetBatchReceiveTreatmentAsses(orgid int64, patient_id int64, record_date int64) (ReceiveAssessmentVM, error) {
+
+	receiveAssessmentVM := ReceiveAssessmentVM{}
+	err := p_service.XTReadDB().Where("user_org_id = ? and patient_id = ? and record_date = ? and status = 1", orgid, patient_id, record_date).Find(&receiveAssessmentVM).Error
+	return receiveAssessmentVM, err
+}
+
+func GetBatchAssessmentBeforeDislysisVM(orgid int64, patient_id int64, assessment_date int64) (AssessmentBeforeDislysisVM, error) {
+
+	AssessmentBeforeDislysisVM := AssessmentBeforeDislysisVM{}
+	err := p_service.XTReadDB().Where("user_org_id = ? and patient_id = ? and assessment_date = ? and status = 1", orgid, patient_id, assessment_date).Find(&AssessmentBeforeDislysisVM).Error
+	return AssessmentBeforeDislysisVM, err
+}
+
+func GetBatchAssessmentAfterDislysisVM(orgid int64, patient_id int64, assessment_date int64) (AssessmentAfterDislysisVM, error) {
+
+	assessmentAfterDislysisVM := AssessmentAfterDislysisVM{}
+	err := p_service.XTReadDB().Where("user_org_id = ? and patient_id = ? and assessment_date = ? and status = 1", orgid, patient_id, assessment_date).Find(&assessmentAfterDislysisVM).Error
+	return assessmentAfterDislysisVM, err
+}
+
+func GetBatchLastAfterWeight(orgid int64, patient_id int64, assessment_date int64) (XtAssessmentAfterDislysisVM, error) {
+
+	xtAssessmentAfterDislysisVM := XtAssessmentAfterDislysisVM{}
+	err := p_service.XTReadDB().Where("user_org_id = ? and patient_id = ? and assessment_date < ? and status = 1", orgid, patient_id, assessment_date).Order("id desc").First(&xtAssessmentAfterDislysisVM).Error
+	return xtAssessmentAfterDislysisVM, err
+}
+
+func GetBatchMonitor(orgid int64, patient_id int64, monitoring_date int64) (MonitoringRecordVM []*MonitoringRecordVM, err error) {
+
+	err = p_service.XTReadDB().Where("user_org_id = ? and patient_id = ? and monitoring_date = ? and status = 1", orgid, patient_id, monitoring_date).Order("operate_time asc").Find(&MonitoringRecordVM).Error
+	return MonitoringRecordVM, err
+}
+
+func GetBatchDoctorAdvice(orgid int64, patient_id int64, advice_date int64) (DoctorAdviceVM []*DoctorAdviceVM, err error) {
+
+	err = p_service.XTReadDB().Where("user_org_id = ? and patient_id = ? and advice_date = ? and status = 1 and  advice_type = 2", orgid, patient_id, advice_date).Order("start_time asc, groupno desc, id asc").Find(&DoctorAdviceVM).Error
+	return DoctorAdviceVM, err
+}
+
+func GetBatchDobuleCheck(orgid int64, patient_id int64, check_date int64) (*DoubleCheckVM, error) {
+
+	doubleCheckVM := DoubleCheckVM{}
+	err := p_service.XTReadDB().Where("user_org_id = ? and patient_id = ? and check_date =? and status = 1", orgid, patient_id, check_date).Find(&doubleCheckVM).Error
+	return &doubleCheckVM, err
+}
+
+func GetBatchSummerVM(orgid int64, patient_id int64, assessment_date int64) (*SummerVM, error) {
+
+	SummerVM := SummerVM{}
+	err := p_service.XTReadDB().Where("user_org_id = ? and patient_id = ? and assessment_date =? and status = 1", orgid, patient_id, assessment_date).Find(&SummerVM).Error
+	return &SummerVM, err
+}

service/schedule_service.go

@@ -706,7 +706,7 @@ func GetWeekDayScheduleById(orgid int64, scheduleDate int64, scheduleType int64,
 
 func GetWeekDayScheduleByIdThee(orgid int64, scheduleDate int64, scheduleType int64, zone []string) (list []*models.VmSchedulesRemind, err error) {
 
-	db := readDb2.Table("xt_schedule as x").Where("x.status = 1")
+	db := XTReadDB().Table("xt_schedule as x").Where("x.status = 1")
 	if orgid > 0 {
 		db = db.Where("x.user_org_id = ?", orgid)
 	}
@@ -733,7 +733,7 @@ func GetWeekDayScheduleByIdThee(orgid int64, scheduleDate int64, scheduleType in
 
 func GetWeekDayScheduleByIdTwo(orgid int64, scheduleDate int64, scheduleType int64, startDate int64, zone []string) (list []*models.VmSchedulesRemind, err error) {
 
-	db := readDb2.Table("xt_schedule as x").Where("x.status = 1")
+	db := XTReadDB().Table("xt_schedule as x").Where("x.status = 1")
 	if orgid > 0 {
 		db = db.Where("x.user_org_id = ?", orgid)
 	}
@@ -747,7 +747,7 @@ func GetWeekDayScheduleByIdTwo(orgid int64, scheduleDate int64, scheduleType int
 		db = db.Where("x.partition_id in (?)", zone)
 	}
 
-	err = db.Select("x.id,x.user_org_id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,x.is_export").Preload("XtPatients", "status = 1").Preload("DeviceZone", "status = 1").Preload("DeviceNumber", "status = 1").Preload("DialysisOrder", "status = 1 and dialysis_date =?", scheduleDate).Preload("XtAssessmentBeforeDislysis", "status = 1 and assessment_date =?", scheduleDate).Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
+	err = db.Select("x.id,x.user_org_id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,x.is_export,x.mode_id").Preload("XtPatients", "status = 1").Preload("DeviceZone", "status = 1").Preload("DeviceNumber", "status = 1").Preload("DialysisOrder", "status = 1 and dialysis_date =?", scheduleDate).Preload("XtAssessmentBeforeDislysis", "status = 1 and assessment_date =?", scheduleDate).Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status =1 and parent_id = 0 and advice_date = ?", scheduleDate).Preload("ChildDoctorAdvice", "status = 1")
 	}).Preload("HisDoctorAdviceInfo", "status = 1 and advice_date = ?", scheduleDate).Preload("DialysisPrescription", "status = 1 and record_date = ?", scheduleDate).Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status =1").Order("id asc")
@@ -912,7 +912,7 @@ func UpdateNewScheduleTemplateStatus(id int64, org_id int64) (err error) {
 
 func GetNextWeekDaySchedule(weektype int64, weektime int64, startime int64, endtime int64, orgID int64, zone []string, record_date int64) (schedules []*models.WeekScheduleSix, err error) {
 
-	db := readDb2.Table("xt_schedule as s ").Where("s.status =1")
+	db := XTReadDB().Table("xt_schedule as s ").Where("s.status =1")
 	if orgID > 0 {
 		db = db.Where("s.user_org_id = ?", orgID)
 	}
@@ -943,7 +943,7 @@ func GetNextWeekDaySchedule(weektype int64, weektime int64, startime int64, endt
 	}).Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status =1 and parent_id = 0 and advice_date = ?", record_date).Preload("ChildDoctorAdvice", "status = 1 and advice_date = ?", record_date)
 	}).Preload("HisDoctorAdviceInfo", "status = 1 and advice_date = ?", record_date).Joins("JOIN xt_patients as p ON p.id = s.patient_id").
-		Select("s.id,s.user_org_id, s.partition_id, s.bed_id, s.patient_id, s.schedule_date, s.schedule_type, s.schedule_week, s.mode_id, s.status, s.created_time, s.updated_time, p.name as patient").
+		Select("s.id,s.user_org_id, s.partition_id, s.bed_id, s.patient_id, s.schedule_date, s.schedule_type, s.schedule_week, s.mode_id, s.status, s.created_time, s.updated_time, p.name as patient,p.id_card_no as id_card_no,p.dialysis_no as dialysis_no,p.gender as gender,p.phone as phone").
 		Order("s.partition_id desc").
 		Find(&schedules).Error
 	return schedules, err
@@ -1107,7 +1107,7 @@ func GetDataPrint(orgid int64) (models.XtDataPrint, error) {
 
 func GetNextWeekPanels(startime int64, endtime int64, orgid int64) (schedule []*models.XtSchedule, err error) {
 
-	err = readDb2.Model(&schedule).Where("schedule_date >=? and schedule_date<=? and status = 1 and user_org_id = ?", startime, endtime, orgid).Preload("LastAfterWeight", func(db *gorm.DB) *gorm.DB {
+	err = XTReadDB().Model(&schedule).Where("schedule_date >=? and schedule_date<=? and status = 1 and user_org_id = ?", startime, endtime, orgid).Preload("LastAfterWeight", func(db *gorm.DB) *gorm.DB {
 		return db.Where("user_org_id = ? and status = 1 and assessment_date < ?", orgid, endtime)
 	}).Find(&schedule).Error
 	return schedule, err
@@ -1236,3 +1236,24 @@ func GetDialysisOrderByBedIdTwo(orgID, start, bed_id int64, schedule_type int64)
 	return order, nil
 
 }
+
+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
+}
+
+func GetLastDialysisOrder(org_id int64, patient_id int64, dialysis_date int64) (models.XtDialysisOrderSix, error) {
+
+	order := models.XtDialysisOrderSix{}
+	err := XTReadDB().Where("user_org_id = ? and patient_id = ? and dialysis_date < ? and status = 1", org_id, patient_id, dialysis_date).Order("id desc").First(&order).Error
+	return order, err
+}
+
+func GetLastDialysisSolution(org_id int64, patient_id int64, mode_id int64, schedule_date int64) (models.DialysisPrescription, error) {
+
+	dialysisprescription := models.DialysisPrescription{}
+	err := XTReadDB().Where("user_org_id = ? and patient_id = ? and mode_id = ? and status = 1 and record_date<?", org_id, patient_id, mode_id, schedule_date).Order("id desc").First(&dialysisprescription).Error
+	return dialysisprescription, err
+
+}

service/stock_service.go

@@ -4237,7 +4237,7 @@ func GetOrderDetialByOrderIdOne(id []string, orgid int64) (out []*models.Warehou
 		db = db.Where("x.org_id = ?", orgid)
 	}
 
-	err = db.Select("x.id,x.warehouse_out_id,x.good_id,sum(x.count) as count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.warehouse_out_order_number,x.type,x.dealer,x.manufacturer,t.social_security_directory_code,x.is_sys,x.sys_record_time,n.number,x.remark,x.license_number,x.storehouse_id,x.admin_user_id,x.buy_price,x.stock_count,x.warehouse_info_id,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.packing_unit,t.min_unit,t.packing_price,x.register_number").Joins("left join xt_warehouse_info as n on n.id=x.warehouse_info_id").Joins("left join xt_good_information as t on t.id=x.good_id").Group("x.warehouse_out_id,x.good_id").Order("x.ctime desc").Scan(&out).Error
+	err = db.Select("x.id,x.warehouse_out_id,x.good_id,sum(x.count) as count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.warehouse_out_order_number,x.type,x.dealer,x.manufacturer,t.social_security_directory_code,x.is_sys,x.sys_record_time,n.number,x.remark,x.license_number,x.storehouse_id,x.admin_user_id,x.buy_price,x.stock_count,x.warehouse_info_id,x.remark,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.packing_unit,t.min_unit,t.packing_price,x.register_number").Joins("left join xt_warehouse_info as n on n.id=x.warehouse_info_id").Joins("left join xt_good_information as t on t.id=x.good_id").Group("x.warehouse_out_id,x.good_id").Order("x.ctime desc").Scan(&out).Error
 
 	return out, err
 }
@@ -7113,6 +7113,13 @@ func GetDrugOpenConfigOne(orgid int64) (models.DrugOutConfig, error) {
 	return config, err
 }
 
+func FindXTHisRecordByOrgIdSix(org_id int64) (models.XtHisConfig, error) {
+
+	config := models.XtHisConfig{}
+	err = readDb.Model(&models.XtHisConfig{}).Where("status = 1 AND user_org_id = ?", org_id).Find(&config).Error
+	return config, err
+}
+
 func CreateDrugOutConfig(config models.DrugOutConfig) error {
 
 	err := XTWriteDB().Create(&config).Error
@@ -7132,6 +7139,12 @@ func FindDrugOutConfigById(orgid int64) (models.DrugOutConfig, error) {
 	return config, err
 }
 
+func FindeDrugSettleConfigById(orgid int64) (models.HisSettleStockConfig, error) {
+	config := models.HisSettleStockConfig{}
+	err := XTReadDB().Where("user_org_id = ? and status = 1", orgid).Find(&config).Error
+	return config, err
+}
+
 func UpdatedWarehouseOut(id int64) error {
 
 	err := XTWriteDB().Model(&models.WarehouseOut{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 1}).Error
@@ -8075,3 +8088,78 @@ func GetInvetoryWarehouseInfoList(orgid int64, storehouse_id int64) (info []*mod
 	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
 	return info, err
 }
+
+func GetSettleOpenConfig(user_org_id int64) (*models.HisSettleStockConfig, error) {
+
+	config := models.HisSettleStockConfig{}
+	err := XTReadDB().Where("user_org_id = ? and status = 1", user_org_id).Find(&config).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &config, nil
+}
+
+func CreateSettleOpenConfig(config models.HisSettleStockConfig) error {
+
+	err := XTReadDB().Create(&config).Error
+	return err
+}
+
+func UpdateSettleOpenConfig(id int64, config models.HisSettleStockConfig) error {
+
+	err := XTWriteDB().Model(&models.HisSettleStockConfig{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_open": config.IsOpen}).Error
+	return err
+}
+
+func UpdateDrugStockAutomaticReduceRecordOne(orgid int64, is_open int64) (models.DrugStockConfig, error) {
+
+	config := models.DrugStockConfig{}
+	err := XTWriteDB().Model(&config).Where("org_id = ? and status = 1", orgid).Update(map[string]interface{}{"is_open": is_open}).Error
+	return config, err
+}
+
+func UpdatePharyConfig(orgid int64, is_open int64) (models.PharmacyConfig, error) {
+
+	stockConfig := models.PharmacyConfig{}
+
+	err := XTWriteDB().Model(&stockConfig).Where("user_org_id = ? and status = 1", orgid).Update(map[string]interface{}{"is_open": is_open}).Error
+
+	return stockConfig, err
+}
+
+func UpdateSettleOpenConfigOne(id int64, is_open int64) error {
+
+	err := XTWriteDB().Model(&models.HisSettleStockConfig{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_open": is_open}).Error
+	return err
+}
+
+func GetSettleOpenConfigByOrgId(user_org_id int64) (models.HisSettleStockConfig, error) {
+
+	config := models.HisSettleStockConfig{}
+	err = XTReadDB().Where("user_org_id = ? and status = 1", user_org_id).Find(&config).Error
+	return config, nil
+}
+
+func GetGoodInformationByGoodIdOne(good_id int64) (models.GoodInformationFourty, error) {
+
+	info := models.GoodInformationFourty{}
+	err := XTReadDB().Where("id = ? and status = 1", good_id).Find(&info).Error
+	return info, err
+}
+
+func GetHisDocById(id int64, orgid int64) (models.HisDoctorAdvice, error) {
+
+	advice := models.HisDoctorAdvice{}
+	err := XTReadDB().Where("id = ? and user_org_id= ? and status = 1", id, orgid).Find(&advice).Error
+	return advice, err
+}
+
+func GetBloodDocById(id int64, orgid int64) (models.DoctorAdvice, error) {
+
+	advice := models.DoctorAdvice{}
+	err := XTReadDB().Where("id = ? and user_org_id= ? and status = 1", id, orgid).Find(&advice).Error
+	return advice, err
+}

service/user_service.go

@@ -51,7 +51,7 @@ func GetAllDoctorAndNurse(orgId, appid int64) (doctors []AdminUserList, nurses [
 func GetAllDoctorAndNurseSix(orgId, appid int64) (doctors []AdminUserList, nurses []AdminUserList, err error) {
 
 	var users []AdminUserList
-	err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("org_id=? and app_id =? and uar.user_type IN (2,3) and ua.status=1", orgId, appid).Select("ua.id, uar.user_name as name, uar.user_type,uar.status").Scan(&users).Error
+	err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("org_id=? and app_id =? and uar.user_type IN (2,3)", orgId, appid).Select("ua.id, uar.user_name as name, uar.user_type,uar.status").Scan(&users).Error
 	if err != nil {
 		return
 	}