11月9日库存管理

conf/app.conf

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

controllers/dialysis_api_controller.go

@@ -99,6 +99,12 @@ func DialysisApiRegistRouters() {
 	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")
 }
 
 func (c *DialysisApiController) GetQueueCall() {
@@ -311,6 +317,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)
 
@@ -416,6 +424,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 {
@@ -645,6 +655,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)
 
@@ -762,6 +774,8 @@ func (c *DialysisApiController) PostSoulution() {
 		DryWaterHour:               dry_water_hour,
 		DrhyWater:                  drhy_water,
 		WaterMachine:               water_machine,
+		AddAmount:                  add_amount,
+		ReduceAmount:               reduce_amount,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -3692,15 +3706,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,
 	})
 
 }
@@ -4722,3 +4737,396 @@ func (this *DialysisApiController) GetSolutionListByOrgId() {
 	})
 
 }
+
+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 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 {
+			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:        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,
+				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
+	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 {
+			//fmt.Println(err)
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+
+	if is_open == 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)
+		}
+	} 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.CheckHisDoctorAdvice(item.ID, creater)
+		}
+	}
+
+	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
+}

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")
@@ -1362,3 +1363,94 @@ 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")
+	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)
+		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)
+		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

@@ -5103,7 +5103,6 @@ func (c *HisApiController) GetUploadInfo() {
 	}()
 	fmt.Println("dec_way", dec_way)
 	if (dec_way == "true" && tmp_decimal == "0") || (dec_way == "true" && tmp_decimal == "") {
-		fmt.Println("tru23332322323323232232332即那里")
 		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "押金不能为0")
 		return
 	}
@@ -5133,6 +5132,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
 
@@ -5145,8 +5147,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 { //月结
 
@@ -5169,6 +5175,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()
@@ -5299,7 +5307,133 @@ func (c *HisApiController) GetUploadInfo() {
 			}
 		}
 
-		//判断库存的地方
+		var goods []*models.DialysisBeforePrepareGoods
+		var newGoods []*models.NewDialysisBeforePrepareGoods
+		var infos []*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
@@ -5357,7 +5491,7 @@ func (c *HisApiController) GetUploadInfo() {
 		if dec_way == "true" {
 
 			tmpstring := strconv.FormatInt(order.ID, 10)
-			fmt.Println("tmpstring222222222", order.ID)
+
 			//扣押金
 			errmsg = service.SpendDeposit(c.GetAdminUserInfo().CurrentOrgId, id, c.GetAdminUserInfo().AdminUser.Id, tmpstring, decimal)
 			order.Decimal = decimal
@@ -5368,15 +5502,8 @@ func (c *HisApiController) GetUploadInfo() {
 				return
 			}
 		}
-		fmt.Println("err233232233232323232wo", err)
 
 		if err == nil {
-
-			houseConfig, _ := service.GetAllStoreHouseConfig(adminUser.CurrentOrgId)
-			var goods []*models.DialysisBeforePrepareGoods
-			var newGoods []*models.NewDialysisBeforePrepareGoods
-			var infos []*models.HisDoctorAdviceInfo
-
 			for _, info := range prescriptions {
 				if info.Type == 1 {
 					infos = append(infos, info.HisDoctorAdviceInfo...)
@@ -5407,7 +5534,7 @@ func (c *HisApiController) GetUploadInfo() {
 
 				}
 			}
-			if adminUser.CurrentOrgId == 9671 {
+			if settConfig.IsOpen == 1 {
 				for _, item := range infos {
 					service.HisDrugsDelivery(item.UserOrgId, adminUser.AdminUser.Id, item)
 				}
@@ -5479,10 +5606,13 @@ 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 _, item := range infos {
+						service.HisDrugsDelivery(item.UserOrgId, adminUser.AdminUser.Id, item)
+					}
+					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": "结算成功",

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
 	}
 

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1111,6 +1111,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,
@@ -1365,6 +1366,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)
@@ -1475,6 +1478,8 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		DrhyWater:                  drhy_water,
 		DryWaterHour:               dry_water_hour,
 		WaterMachine:               water_machine,
+		AddAmount:                  add_amount,
+		ReduceAmount:               reduce_amount,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -2594,6 +2599,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
@@ -2718,6 +2725,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)

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,11 @@ 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")
 			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"
@@ -1874,6 +1875,7 @@ 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 {
@@ -1981,6 +1983,7 @@ 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 {
@@ -3247,7 +3250,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,

models/dialysis.go

@@ -1095,16 +1095,17 @@ 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"`
-	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"`
+	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 QueueCallConfig struct {
@@ -1252,3 +1253,91 @@ type DialysisOrderTwenty struct {
 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"
+}

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,7 @@ 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"`
 }
 
 func (HisDoctorAdviceInfo) TableName() string {
@@ -860,6 +861,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 +2428,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/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 {
@@ -1634,3 +1636,15 @@ type DialysisPrescriptionThrity struct {
 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"
+}

service/dialysis_service.go

@@ -1885,3 +1885,70 @@ func GetScheduleTypeById(org_id int64, schedule_date int64, schedule_type int64)
 	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().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().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 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
+}

service/his_service.go

@@ -535,6 +535,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 {
@@ -566,6 +582,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 {
@@ -2390,6 +2422,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 {
@@ -2588,3 +2639,19 @@ 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_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_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 {

service/stock_service.go

@@ -7132,6 +7132,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 +8081,64 @@ 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
+}