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

conf/app.conf

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

controllers/base_api_controller.go

@@ -2,7 +2,6 @@ package controllers
 
 import (
 	"XT_New/enums"
-	"XT_New/models"
 	"XT_New/service"
 	"fmt"
 	"strconv"
@@ -70,36 +69,36 @@ type BaseAuthAPIController struct {
 func (this *BaseAuthAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		var userAdmin models.AdminUser
-		userAdmin.Id = 1448
-		userAdmin.Mobile = "13318599895"
-
-		userAdmin.Id = 597
-		userAdmin.Mobile = "19874122664"
-		userAdmin.IsSuperAdmin = false
-		userAdmin.Status = 1
-		userAdmin.CreateTime = 1530786071
-		userAdmin.ModifyTime = 1530786071
-		var subscibe models.ServeSubscibe
-		subscibe.ID = 1
-		subscibe.OrgId = 3877
-		subscibe.PeriodStart = 1538035409
-		subscibe.PeriodEnd = 1569571409
-		subscibe.State = 1
-		subscibe.Status = 1
-		subscibe.CreatedTime = 1538035409
-		subscibe.UpdatedTime = 1538035409
-		subscibes := make(map[int64]*models.ServeSubscibe, 0)
-		subscibes[4] = &subscibe
-		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 3877
-		adminUserInfo.CurrentAppId = 4
-		adminUserInfo.AdminUser = &userAdmin
-		adminUserInfo.Subscibes = subscibes
-		this.SetSession("admin_user_info", &adminUserInfo)
-
-		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		//this.StopRun()
+		//var userAdmin models.AdminUser
+		//userAdmin.Id = 1448
+		//userAdmin.Mobile = "13318599895"
+		//
+		//userAdmin.Id = 597
+		//userAdmin.Mobile = "19874122664"
+		//userAdmin.IsSuperAdmin = false
+		//userAdmin.Status = 1
+		//userAdmin.CreateTime = 1530786071
+		//userAdmin.ModifyTime = 1530786071
+		//var subscibe models.ServeSubscibe
+		//subscibe.ID = 1
+		//subscibe.OrgId = 3877
+		//subscibe.PeriodStart = 1538035409
+		//subscibe.PeriodEnd = 1569571409
+		//subscibe.State = 1
+		//subscibe.Status = 1
+		//subscibe.CreatedTime = 1538035409
+		//subscibe.UpdatedTime = 1538035409
+		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
+		//subscibes[4] = &subscibe
+		//var adminUserInfo service.AdminUserInfo
+		//adminUserInfo.CurrentOrgId = 3877
+		//adminUserInfo.CurrentAppId = 4
+		//adminUserInfo.AdminUser = &userAdmin
+		//adminUserInfo.Subscibes = subscibes
+		//this.SetSession("admin_user_info", &adminUserInfo)
+
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		this.StopRun()
 
 	}
 
@@ -316,35 +315,35 @@ type BaseServeAPIController struct {
 func (this *BaseServeAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		var userAdmin models.AdminUser
-		userAdmin.Id = 1448
-		userAdmin.Mobile = "13318599895"
-
-		userAdmin.Id = 597
-		userAdmin.Mobile = "19874122664"
-		userAdmin.IsSuperAdmin = false
-		userAdmin.Status = 1
-		userAdmin.CreateTime = 1530786071
-		userAdmin.ModifyTime = 1530786071
-		var subscibe models.ServeSubscibe
-		subscibe.ID = 1
-		subscibe.OrgId = 3877
-		subscibe.PeriodStart = 1538035409
-		subscibe.PeriodEnd = 1569571409
-		subscibe.State = 1
-		subscibe.Status = 1
-		subscibe.CreatedTime = 1538035409
-		subscibe.UpdatedTime = 1538035409
-		subscibes := make(map[int64]*models.ServeSubscibe, 0)
-		subscibes[4] = &subscibe
-		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 3877
-		adminUserInfo.CurrentAppId = 4
-		adminUserInfo.AdminUser = &userAdmin
-		adminUserInfo.Subscibes = subscibes
-		this.SetSession("admin_user_info", &adminUserInfo)
-		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		//this.StopRun()
+		//var userAdmin models.AdminUser
+		//userAdmin.Id = 1448
+		//userAdmin.Mobile = "13318599895"
+		//
+		//userAdmin.Id = 597
+		//userAdmin.Mobile = "19874122664"
+		//userAdmin.IsSuperAdmin = false
+		//userAdmin.Status = 1
+		//userAdmin.CreateTime = 1530786071
+		//userAdmin.ModifyTime = 1530786071
+		//var subscibe models.ServeSubscibe
+		//subscibe.ID = 1
+		//subscibe.OrgId = 3877
+		//subscibe.PeriodStart = 1538035409
+		//subscibe.PeriodEnd = 1569571409
+		//subscibe.State = 1
+		//subscibe.Status = 1
+		//subscibe.CreatedTime = 1538035409
+		//subscibe.UpdatedTime = 1538035409
+		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
+		//subscibes[4] = &subscibe
+		//var adminUserInfo service.AdminUserInfo
+		//adminUserInfo.CurrentOrgId = 3877
+		//adminUserInfo.CurrentAppId = 4
+		//adminUserInfo.AdminUser = &userAdmin
+		//adminUserInfo.Subscibes = subscibes
+		//this.SetSession("admin_user_info", &adminUserInfo)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		this.StopRun()
 	}
 
 	//if adminUserInfo.AppRole != nil {

controllers/drug_stock_api_contorller.go

@@ -2213,10 +2213,10 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 						dealer_id = item.ID
 					}
 				}
-
+				cancelInfo, _ := service.GetLastDrugCancelStockById(adminUserInfo.CurrentOrgId)
 				cancelStockInfo := &models.DrugCancelStockInfo{
-					OrderNumber:      cancelStock.OrderNumber,
-					CancelStockId:    cancelStock.ID,
+					OrderNumber:      cancelInfo.OrderNumber,
+					CancelStockId:    cancelInfo.ID,
 					DrugId:           drug_id,
 					Count:            count,
 					Status:           1,
@@ -2278,6 +2278,7 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 	}
 	//扣减库存逻辑
 	for _, item := range cancelStockInfos {
+
 		var total_number int64
 		var out_number int64
 		var can_number int64
@@ -2289,12 +2290,10 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 		if item.MaxUnit == medical.MinUnit {
 			total_number = item.Count
 		}
-		fmt.Println("当前退库数量", total_number)
 		//查询当前药品退库的批次号的总入库数
 		infoWareInfo, _ := service.GetDrugWarehouseInfo(item.BatchNumberId)
-		fmt.Println("hhh2h3h2hh3233", item.MaxUnit, medical.MaxUnit, infoWareInfo.StockMaxNumber, infoWareInfo.StockMinNumber)
 		var total_count int64
-		total_count = infoWareInfo.StockMaxNumber*medical.MinNumber + infoWareInfo.StockMinNumber
+		total_count = infoWareInfo.WarehousingCount * medical.MinNumber
 		fmt.Println("当前批次总库存", total_count)
 
 		//查询该批次的出库数量
@@ -2311,6 +2310,7 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 				item.Count = item.Count
 			}
 		}
+
 		for _, item := range canInfo {
 			can_number += item.Count
 		}
@@ -2326,8 +2326,7 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 		for _, item := range outInfo {
 			out_number += item.Count
 		}
-		fmt.Println("当前退库数量", total_number)
-		fmt.Println("出库数量23232232323222332", out_number)
+
 		if out_number == 0 {
 			service.UpdateDrugCancel(item.CancelStockId)
 			c.ServeSuccessJSON(map[string]interface{}{
@@ -2335,8 +2334,11 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 			})
 			return
 		}
+
+		fmt.Println("hhhh233323232322323", total_number, total_count)
+
 		//判断退库数量是否大于总入库数量
-		if total_number > out_number {
+		if total_number > total_count {
 			service.UpdateDrugCancel(item.CancelStockId)
 			c.ServeSuccessJSON(map[string]interface{}{
 				"msg": "2",
@@ -2346,7 +2348,8 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 
 		//判断总退库数量是否大于出库数量
 		fmt.Println("该批次总退库数量", can_number+total_number)
-		fmt.Println("总出口数量", out_number)
+		fmt.Println("总出库数量", out_number)
+		fmt.Println("当前退库数量", total_number)
 		if can_number+total_number > out_number {
 			//清空退库单
 			service.UpdateDrugCancel(item.CancelStockId)
@@ -2355,7 +2358,8 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 			})
 			return
 		}
-
+		fmt.Println("当前退库数量", total_number)
+		fmt.Println("总出口数量", out_number)
 		//正常退库
 		if total_number <= out_number {
 			//创建退库详情
@@ -2399,15 +2403,6 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 					"msg": "1",
 				})
 			}
-			if errs != nil {
-				utils.ErrorLog(errs.Error())
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCancelStockFail)
-				return
-			}
-
-			c.ServeSuccessJSON(map[string]interface{}{
-				"msg": "1",
-			})
 		}
 	}
 }

controllers/gobal_config_api_controller.go

@@ -1040,6 +1040,10 @@ func (c *GobalConfigApiController) GetPrintInfo() {
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
 	idsInters := dataBody["ids"].([]interface{})
+	advice_type, _ := c.GetInt64("advice_type")
+	stop_type, _ := c.GetInt64("stop_type")
+	fmt.Println("advcie_type23323232322332", advice_type)
+	fmt.Println("stop_type33332323223232323", stop_type)
 	if len(idsInters) == 0 {
 		if err != nil {
 			c.ServeFailJsonSend(enums.ErrorCodeDBDelete, "删除会员失败:（没有选择会员）")

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -3955,18 +3955,6 @@ func (c *DialysisAPIController) EditConsumables() {
 							err = ConsumablesDeliveryTotalSix(adminInfo.Org.Id, patient_id, record_time, beforePrepares, newBeforePrepares, adminInfo.AdminUser.Id)
 							break
 						}
-
-						//if lastInfo.StockCount >= last_total {
-						//	err = ConsumablesDeliveryTotalSix(adminInfo.Org.Id, patient_id, record_time, beforePrepares, newBeforePrepares, adminInfo.AdminUser.Id)
-						//	break
-						//}
-						//
-						////如果库存不够，则出库到下一个批次
-						//if lastInfo.StockCount < last_total {
-						//
-						//	err = ConsumablesDeliveryTotalSix(adminInfo.Org.Id, patient_id, record_time, beforePrepares, newBeforePrepares, adminInfo.AdminUser.Id)
-						//	break
-						//}
 					}
 				}
 

controllers/mobile_api_controllers/patient_api_controller.go

@@ -975,6 +975,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 func (c *PatientApiController) ModifyExecDoctorAdvice() {
 	execution_time := c.GetString("execution_time")
+	fmt.Println("execution_time", execution_time)
 	groupno, _ := c.GetInt64("groupno", -1)
 
 	var ids []string
@@ -1060,7 +1061,14 @@ func (c *PatientApiController) ModifyExecDoctorAdvice() {
 			ExecutionTime: theTime.Unix(),
 			UpdatedTime:   time.Now().Unix(),
 		}
+		fmt.Println("ids2323232232323", ids)
 		service.ModifyExceDoctorAdviceById(&advicesinfo, ids)
+
+		project := models.HisPrescriptionProject{
+			ExecutionTime: theTime.Unix(),
+			Mtime:         time.Now().Unix(),
+		}
+		service.ModifyHisPrescriptionProject(&project, ids)
 	}
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateDoctorAdviceFail)

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -293,7 +293,7 @@ func (this *StaffScheduleApiController) GetPatientScheduleList() {
 	}
 	if is_open == 1 {
 		//获取空床位的排班数据
-		list, err := service.GetPatientScheduleByBed(startTime, zoneid, orgid)
+		list, err := service.GetPatientScheduleByBed(startTime, zoneid, orgid, classtype)
 		stockType, _ := service.GetStockType(orgid)
 		if err != nil {
 			this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
@@ -372,55 +372,92 @@ func (this *StaffScheduleApiController) UpdatePatientScheduleById() {
 		"msg": "切换成功",
 	})
 }
-
-func (this *StaffScheduleApiController) UpdateBloodSchedule() {
-	timeLayout := "2006-01-02"
-	loc, _ := time.LoadLocation("Local")
-	id, _ := this.GetInt64("id")
+func (this *StaffScheduleApiController) UpdateDialysisPrescription() {
 	patient_id, _ := this.GetInt64("patient_id")
+	start_time, _ := this.GetInt64("start_time")
 	mode_id, _ := this.GetInt64("mode_id")
-	schedule_type, _ := this.GetInt64("schedule_type")
-	start_time := this.GetString("start_time")
 	dialyzer_perfusion_apparatus := this.GetString("dialyzer_perfusion_apparatus")
-	var startTime int64
-	if len(start_time) > 0 {
-		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	dialysis_irrigation := this.GetString("dialysis_irrigation")
+	//更改透析模式
+	_, errcode := service.GetDialyisSolution(patient_id, start_time)
+	if errcode == gorm.ErrRecordNotFound {
+		orgId := this.GetMobileAdminUserInfo().Org.Id
+		prescription := models.DialysisPrescription{
+			DialysisDialyszers: dialyzer_perfusion_apparatus,
+			DialysisIrrigation: dialysis_irrigation,
+			PatientId:          patient_id,
+			UserOrgId:          orgId,
+			Status:             1,
+			RecordDate:         start_time,
+			CreatedTime:        time.Now().Unix(),
+			ModeId:             mode_id,
+		}
+		err := service.CreateDialysisPrescription(&prescription)
+
 		if err != nil {
-			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
 			return
 		}
-		startTime = theTime.Unix()
+		this.ServeSuccessJSON(map[string]interface{}{
+			"msg": "保存成功",
+		})
+	} else if errcode == nil {
+		prescription := models.DialysisPrescription{
+			DialysisDialyszers: dialyzer_perfusion_apparatus,
+			DialysisIrrigation: dialysis_irrigation,
+			ModeId:             mode_id,
+		}
+		err := service.UpdateDialysisPrescriptionOne(prescription, patient_id, start_time, mode_id)
+		if err != nil {
+			this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"msg": "保存成功",
+		})
 	}
+}
 
+func (this *StaffScheduleApiController) UpdateBloodScheduleMode() {
+	id, _ := this.GetInt64("id")
+	mode_id, _ := this.GetInt64("mode_id")
+	schedule := models.XtSchedule{
+		ModeId: mode_id,
+	}
+	service.UpdatedScheduleMode(schedule, id)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"msg": "保存成功",
+	})
+}
+
+func (this *StaffScheduleApiController) UpdateBloodSchedule() {
+
+	patient_id, _ := this.GetInt64("patient_id")
+	fmt.Println(patient_id)
+	mode_id, _ := this.GetInt64("mode_id")
+	schedule_type, _ := this.GetInt64("schedule_type")
+	start_time, _ := this.GetInt64("start_time")
+	bed_id, _ := this.GetInt64("bed_id")
 	//更改排班
 	schedule := models.XtSchedule{
 		ScheduleType: schedule_type,
 		ModeId:       mode_id,
 	}
 
-	service.UpdatedSchedule(schedule, id)
-
-	//更改透析模式
-	_, errcode := service.GetDialyisSolution(patient_id, startTime)
-	if errcode == gorm.ErrRecordNotFound {
-		orgId := this.GetAdminUserInfo().CurrentOrgId
-		prescription := models.DialysisPrescription{
-			DialyzerPerfusionApparatus: dialyzer_perfusion_apparatus,
-			DialysisDialyszers:         dialyzer_perfusion_apparatus,
-			PatientId:                  patient_id,
-			UserOrgId:                  orgId,
-			Status:                     1,
-			RecordDate:                 startTime,
-			CreatedTime:                time.Now().Unix(),
-		}
-		service.CreateDialysisPrescription(prescription)
-	} else if errcode == nil {
-		prescription := models.DialysisPrescription{
-			DialyzerPerfusionApparatus: dialyzer_perfusion_apparatus,
-			DialysisDialyszers:         dialyzer_perfusion_apparatus,
-		}
-		service.UpdateDialysisPrescriptionOne(prescription, patient_id, startTime)
+	//查询该床位该班次是否存在排班
+	_, errschedulecode := service.GetPatientScheduleIsExist(start_time, schedule_type, bed_id)
+	if errschedulecode == gorm.ErrRecordNotFound {
+		service.UpdatedSchedule(schedule, patient_id, start_time, schedule_type, bed_id)
+		this.ServeSuccessJSON(map[string]interface{}{
+			"msgerr": "保存成功",
+		})
+	} else if errschedulecode == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"msg":    "1",
+			"msgerr": "排班已存在",
+		})
 	}
+
 }
 
 func (this *StaffScheduleApiController) GetSchedulePatient() {

controllers/new_mobile_api_controllers/staff_schedule_api_router.go

@@ -20,6 +20,8 @@ func StaffScheduleApiControllersRegisterRouters() {
 	beego.Router("/m/api/deleteSchedule", &StaffScheduleApiController{}, "Get:DeleteSchedule")
 	beego.Router("/m/api/ssearchpatient", &StaffScheduleApiController{}, "Get:SearchPatient")
 	beego.Router("/m/api/updatepatientschedule", &StaffScheduleApiController{}, "Get:UpdatePatientScheduleById")
+	beego.Router("/m/api/updateschedulemode", &StaffScheduleApiController{}, "Get:UpdateBloodScheduleMode")
+	beego.Router("/m/api/updatedialysisprescription", &StaffScheduleApiController{}, "Get:UpdateDialysisPrescription")
 	beego.Router("/m/api/updateschedule", &StaffScheduleApiController{}, "Get:UpdateBloodSchedule")
 	beego.Router("m/api/schedule/patients", &StaffScheduleApiController{}, "Get:GetSchedulePatient")
 	beego.Router("/m/api/schedule/create", &StaffScheduleApiController{}, "Post:CreateMobileSchedulePatient")

controllers/self_drug_api_congtroller.go

@@ -83,6 +83,8 @@ func SelfDrugRouters() {
 	beego.Router("/api/drug/saveinentorylist", &SelfDrugApiController{}, "Post:SaveInventoryList")
 
 	beego.Router("/api/drug/getdamagebydrugid", &SelfDrugApiController{}, "Get:GetDamageByDrugId")
+
+	beego.Router("/api/drug/getinventorymodelist", &SelfDrugApiController{}, "Get:GetInventoryModeList")
 }
 
 func (this *SelfDrugApiController) GetCurrentPatient() {
@@ -2607,3 +2609,20 @@ func (this *SelfDrugApiController) GetDamageByDrugId() {
 		"list": list,
 	})
 }
+
+func (this *SelfDrugApiController) GetInventoryModeList() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	list, err := service.GetInventoryModeList(orgId)
+	manufacturerList, err := service.GetAllManufacturerList(orgId)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":             list,
+		"manufacturerList": manufacturerList,
+	})
+}

controllers/stock_in_api_controller.go

@@ -131,6 +131,7 @@ func StockManagerApiRegistRouters() {
 	beego.Router("/api/stock/getgoodinventorywarehouselist", &StockManagerApiController{}, "Get:GetGoodInventoryWarehouseList")
 	beego.Router("/api/stock/savestockinentorylist", &StockManagerApiController{}, "Post:SaveStockInventoryList")
 	beego.Router("/api/sotck/getdamagedetailbygoodid", &StockManagerApiController{}, "Get:GetDamageDetailByGoodId")
+	beego.Router("/api/stock/getinventoryexportlist", &StockManagerApiController{}, "Get:GetInventoryExportList")
 }
 
 func (c *StockManagerApiController) CreateWarehouse() {
@@ -2092,7 +2093,9 @@ func (c *StockManagerApiController) CreateCancelStock() {
 	for _, item := range cancelStockInfos {
 
 		//统计该批次耗材的出库数量
-		info, _ := service.GetWarehoureOrderInfoCount(item.GoodId, item.OrgId, item.WarehouseInfoId)
+		//info, _ := service.GetWarehoureOrderInfoCount(item.GoodId, item.OrgId, item.WarehouseInfoId)
+
+		info, _ := service.GetWarehoureOrderStockOutFlow(item.GoodId, item.OrgId, item.WarehouseInfoId)
 		fmt.Println("2333223323322332233223322323", item.Count, info.Count)
 		if item.Count > info.Count {
 			service.UpdateCancelInfo(item.CancelStockId)
@@ -2489,7 +2492,7 @@ func (c *StockManagerApiController) EditCancelStock() {
 
 		for _, item := range cancelStockInfos {
 			//统计该耗材的出库数量
-			info, _ := service.GetWarehoureOrderInfoCount(item.GoodId, item.OrgId, item.WarehouseInfoId)
+			info, _ := service.GetWarehoureOrderStockOutFlow(item.GoodId, item.OrgId, item.WarehouseInfoId)
 			if item.Count > info.Count {
 				c.ServeSuccessJSON(map[string]interface{}{
 					"msg": "2",
@@ -6496,3 +6499,15 @@ func (this *StockManagerApiController) GetDamageDetailByGoodId() {
 		"damageList": damageList,
 	})
 }
+
+func (this *StockManagerApiController) GetInventoryExportList() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	list, _ := service.GetInventoryExportList(orgId)
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":             list,
+		"manufacturerList": manufacturerList,
+	})
+}

models/common_models.go

@@ -294,6 +294,8 @@ type BloodDialysisPrescription struct {
 	PunctureNeedleCount        float64 `gorm:"column:puncture_needle_count" json:"puncture_needle_count" form:"puncture_needle_count"`
 	Epo                        string  `gorm:"column:epo" json:"epo" form:"epo"`
 	EpoCount                   float64 `gorm:"column:epo_count" json:"epo_count" form:"epo_count"`
+	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 (BloodDialysisPrescription) TableName() string {

models/device_models.go

@@ -140,15 +140,16 @@ func (DeviceGroup) TableName() string {
 }
 
 type DeviceNumber struct {
-	ID         int64  `gorm:"column:id" json:"id"`
-	OrgID      int64  `gorm:"column:org_id" json:"-"`
-	Number     string `gorm:"column:number" json:"number"`
-	GroupID    int64  `gorm:"column:group_id" json:"group_id"`
-	ZoneID     int64  `gorm:"column:zone_id" json:"zone_id"`
-	Status     int8   `json:"-"`
-	CreateTime int64  `gorm:"column:ctime" json:"-"`
-	ModifyTime int64  `gorm:"column:mtime" json:"-"`
-	Sort       int64  `gorm:"column:sort" json:"sort" form:"sort"`
+	ID         int64      `gorm:"column:id" json:"id"`
+	OrgID      int64      `gorm:"column:org_id" json:"-"`
+	Number     string     `gorm:"column:number" json:"number"`
+	GroupID    int64      `gorm:"column:group_id" json:"group_id"`
+	ZoneID     int64      `gorm:"column:zone_id" json:"zone_id"`
+	Status     int8       `json:"-"`
+	CreateTime int64      `gorm:"column:ctime" json:"-"`
+	ModifyTime int64      `gorm:"column:mtime" json:"-"`
+	Sort       int64      `gorm:"column:sort" json:"sort" form:"sort"`
+	DeviceZone DeviceZone `json:"zone" gorm:"foreignkey:ID;AssociationForeignKey:ZoneID;"`
 }
 
 func (DeviceNumber) TableName() string {

models/drug.go

@@ -65,9 +65,10 @@ type BaseDrugLib struct {
 	HospApprFlag                int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
 	LmtUsedFlag                 int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
 	//MedicineInsurancePercentage []*MedicineInsurancePercentage `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
-	DrugDay               string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
-	Total                 float64 `gorm:"column:total" json:"total" form:"total"`
-	PrescribingNumberUnit string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	DrugDay               string                 `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
+	Total                 float64                `gorm:"column:total" json:"total" form:"total"`
+	PrescribingNumberUnit string                 `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	DrugWarehouseInfo     []*XtDrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug_warehouse_info"`
 }
 
 func (BaseDrugLib) TableName() string {

models/patient_models.go

@@ -1250,7 +1250,7 @@ type XtAssessmentBeforeDislysis struct {
 	DuctusArantii                  string  `gorm:"column:ductus_arantii" json:"ductus_arantii" form:"ductus_arantii"`
 	EmergencyTreatment             int64   `gorm:"column:emergency_treatment" json:"emergency_treatment" form:"emergency_treatment"`
 	EmergencyTreatmentOther        string  `gorm:"column:emergency_treatment_other" json:"emergency_treatment_other" form:"emergency_treatment_other"`
-	DialysisCount                  int64   `gorm:"column:dialysis_count" json:"dialysis_count" form:"dialysis_count"`
+	DialysisCount                  string  `gorm:"column:dialysis_count" json:"dialysis_count" form:"dialysis_count"`
 	AssessmentDoctor               int64   `gorm:"column:assessment_doctor" json:"assessment_doctor" form:"assessment_doctor"`
 	AssessmentTime                 int64   `gorm:"column:assessment_time" json:"assessment_time" form:"assessment_time"`
 	MachineType                    string  `gorm:"column:machine_type" json:"machine_type" form:"machine_type"`
@@ -1262,7 +1262,7 @@ type XtAssessmentBeforeDislysis struct {
 	DuctusArantiiOther             string  `gorm:"column:ductus_arantii_other" json:"ductus_arantii_other" form:"ductus_arantii_other"`
 	PunctureNeedle                 string  `gorm:"column:puncture_needle" json:"puncture_needle" form:"puncture_needle"`
 	DialysisIntakesUnit            int64   `gorm:"column:dialysis_intakes_unit" json:"dialysis_intakes_unit" form:"dialysis_intakes_unit"`
-	HumorExcessiveSymptom          int64   `gorm:"column:humor_excessive_symptom" json:"humor_excessive_symptom" form:"humor_excessive_symptom"`
+	HumorExcessiveSymptom          string  `gorm:"column:humor_excessive_symptom" json:"humor_excessive_symptom" form:"humor_excessive_symptom"`
 	LastPostDialysisOther          string  `gorm:"column:last_post_dialysis_other" json:"last_post_dialysis_other" form:"last_post_dialysis_other"`
 	SymptomBeforeDialysisOther     string  `gorm:"column:symptom_before_dialysis_other" json:"symptom_before_dialysis_other" form:"symptom_before_dialysis_other"`
 	DialysisInterphaseOther        string  `gorm:"column:dialysis_interphase_other" json:"dialysis_interphase_other" form:"dialysis_interphase_other"`

models/schedule_models.go

@@ -49,7 +49,7 @@ type Schedule struct {
 	DeviceNumber              DeviceNumber         `json:"number" gorm:"foreignkey:ID;AssociationForeignKey:BedId;"`
 	TreatmentMode             TreatmentMode        `json:"mode" gorm:"foreignkey:ModeId"`
 	DialysisOrder             DialysisOrder        `json:"order" gorm:"foreignkey:DialysisDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
-	DialysisPrescription      DialysisPrescription `json:"order" gorm:"foreignkey:RecordDate,PatientId;AssociationForeignKey:RecordDate,PatientId;"`
+	DialysisPrescription      DialysisPrescription `json:"dialysis_prescription" gorm:"foreignkey:RecordDate,PatientId;AssociationForeignKey:RecordDate,PatientId;"`
 	PatientInfectiousDiseases []InfectiousDiseases `json:"patient_contagions" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
 }
 
@@ -190,14 +190,13 @@ type VmSchedulesRemind struct {
 
 	DeviceZone                 DeviceZone                 `json:"zone" gorm:"foreignkey:ID;AssociationForeignKey:PartitionId;"`
 	DeviceNumber               DeviceNumber               `json:"number" gorm:"foreignkey:ID;AssociationForeignKey:BedId;"`
-	DialysisOrder              DialysisOrder              `json:"order" gorm:"foreignkey:DialysisDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
+	DialysisOrder              DialysisOrder              `json:"order" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
 	XtPatients                 XtPatients                 `json:"patient" gorm:"foreignkey:ID;AssociationForeignKey:PatientId;"`
-	DoctorAdvice               []*DoctorAdvice            `json:"doctoradvice" gorm:"foreignkey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
-	DialysisPrescription       DialysisPrescription       `json:"prescription" gorm:"foreignkey:RecordDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
-	HisDoctorAdviceInfo        []*HisDoctorAdviceInfo     `json:"hisdoctoradviceinfo" gorm:"foreignkey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
-	DialysisSolution           DialysisSolution           `json:"dialysissolution" gorm:"foreignkey:RecordDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
-	XtAssessmentBeforeDislysis XtAssessmentBeforeDislysis `json:"assessmentbefor" gorm:"foreignkey:AssessmentDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
-	Solution                   []*DialysisSolution        `json:"solution" gorm:"foreignkey:RecordDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
+	DoctorAdvice               []*DoctorAdvice            `json:"doctoradvice" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
+	DialysisPrescription       DialysisPrescription       `json:"prescription" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
+	HisDoctorAdviceInfo        []*HisDoctorAdviceInfo     `json:"hisdoctoradviceinfo" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
+	DialysisSolution           DialysisSolution           `json:"dialysissolution" gorm:"foreignkey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId;"`
+	XtAssessmentBeforeDislysis XtAssessmentBeforeDislysis `json:"assessmentbefor" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
 }
 
 func (VmSchedulesRemind) TableName() string {
@@ -225,7 +224,6 @@ type WeekScheduleSix struct {
 	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;"`
-	Solution                   []*DialysisSolution        `json:"solution" gorm:"foreignkey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId"`
 	DialysisSolution           DialysisSolution           `json:"dialysissolution" gorm:"foreignkey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId"`
 	XtAssessmentBeforeDislysis XtAssessmentBeforeDislysis `json:"assessmentbefor" gorm:"foreignkey:PatientId,AssessmentDate;AssociationForeignKey:PatientId,ScheduleDate"`
 }

models/self_drug_models.go

@@ -936,3 +936,21 @@ type SgjDrugWarehouseOutInfo struct {
 func (SgjDrugWarehouseOutInfo) TableName() string {
 	return "xt_drug_warehouse_out_info"
 }
+
+type PatientDrugWarehouseInfo struct {
+	DrugId         int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Number         string  `gorm:"column:number" json:"number" form:"number"`
+	ProductDate    int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate     int64   `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	StockMaxNumber int64   `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
+	StockMinNumber int64   `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
+	BatchNumber    string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	DrugName       string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	MaxUnit        string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinUnit        string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	MinNumber      int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	Dose           float64 `gorm:"column:dose" json:"dose" form:"dose"`
+	DoseUnit       string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
+	Manufacturer   int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer         int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
+}

models/stock_models.go

@@ -551,29 +551,30 @@ func (VmStockFlow) TableName() string {
 }
 
 type CancelStockInfo struct {
-	ID              int64       `gorm:"column:id" json:"id"`
-	GoodId          int64       `gorm:"column:good_id" json:"good_id"`
-	CancelStockId   int64       `gorm:"column:cancel_stock_id" json:"cancel_stock_id"`
-	GoodTypeId      int64       `gorm:"column:good_type_id" json:"good_type_id"`
-	Count           int64       `gorm:"column:count" json:"count"`
-	Price           float64     `gorm:"column:price" json:"price"`
-	Total           float64     `gorm:"column:total" json:"total"`
-	ProductDate     int64       `gorm:"column:product_date" json:"product_date"`
-	ExpiryDate      int64       `gorm:"column:expiry_date" json:"expiry_date"`
-	Ctime           int64       `gorm:"column:ctime" json:"ctime"`
-	Mtime           int64       `gorm:"column:mtime" json:"mtime"`
-	Status          int64       `gorm:"column:status" json:"status"`
-	OrgId           int64       `gorm:"column:org_id" json:"org_id"`
-	OrderNumber     string      `gorm:"column:order_number" json:"order_number"`
-	Type            int64       `gorm:"column:type" json:"type"`
-	CancelStock     CancelStock `ForeignKey:CancelStockId json:"CancelStock"`
-	Dealer          string      `gorm:"column:dealer" json:"dealer"`
-	Manufacturer    string      `gorm:"column:manufacturer" json:"manufacturer"`
-	Number          string      `gorm:"column:number" json:"number" form:"number"`
-	RegisterAccount string      `gorm:"column:register_account" json:"register_account" form:"register_account"`
-	Remark          string      `gorm:"column:remark" json:"remark" form:"remark"`
-	WarehouseInfoId int64       `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
-	GoodInfo        GoodInfo    `gorm:"ForeignKey:ID;AssociationForeignKey:GoodId" `
+	ID              int64              `gorm:"column:id" json:"id"`
+	GoodId          int64              `gorm:"column:good_id" json:"good_id"`
+	CancelStockId   int64              `gorm:"column:cancel_stock_id" json:"cancel_stock_id"`
+	GoodTypeId      int64              `gorm:"column:good_type_id" json:"good_type_id"`
+	Count           int64              `gorm:"column:count" json:"count"`
+	Price           float64            `gorm:"column:price" json:"price"`
+	Total           float64            `gorm:"column:total" json:"total"`
+	ProductDate     int64              `gorm:"column:product_date" json:"product_date"`
+	ExpiryDate      int64              `gorm:"column:expiry_date" json:"expiry_date"`
+	Ctime           int64              `gorm:"column:ctime" json:"ctime"`
+	Mtime           int64              `gorm:"column:mtime" json:"mtime"`
+	Status          int64              `gorm:"column:status" json:"status"`
+	OrgId           int64              `gorm:"column:org_id" json:"org_id"`
+	OrderNumber     string             `gorm:"column:order_number" json:"order_number"`
+	Type            int64              `gorm:"column:type" json:"type"`
+	CancelStock     CancelStock        `ForeignKey:CancelStockId json:"CancelStock"`
+	Dealer          string             `gorm:"column:dealer" json:"dealer"`
+	Manufacturer    string             `gorm:"column:manufacturer" json:"manufacturer"`
+	Number          string             `gorm:"column:number" json:"number" form:"number"`
+	RegisterAccount string             `gorm:"column:register_account" json:"register_account" form:"register_account"`
+	Remark          string             `gorm:"column:remark" json:"remark" form:"remark"`
+	WarehouseInfoId int64              `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	GoodInfo        GoodInfo           `gorm:"ForeignKey:ID;AssociationForeignKey:GoodId" `
+	WarehousingInfo []*WarehousingInfo `gorm:"ForeignKey:GoodId;AssociationForeignKey:GoodId" json:"xt_warehouse_info"`
 }
 
 func (CancelStockInfo) TableName() string {
@@ -1124,3 +1125,22 @@ type GoodSotckInfo struct {
 func (GoodSotckInfo) TableName() string {
 	return "xt_warehouse_info"
 }
+
+type PatientWarehouseInfo struct {
+	ID                int64  `gorm:"column:id" json:"id" form:"id"`
+	GoodId            int64  `gorm:"column:good_id" json:"good_id" form:"good_id"`
+	Number            string `gorm:"column:number" json:"number" form:"number"`
+	ProductDate       int64  `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate        int64  `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	WarehousingUnit   string `gorm:"column:warehousing_unit" json:"warehousing_unit" form:"warehousing_unit"`
+	Dealer            int64  `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer      int64  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	GoodName          string `gorm:"column:good_name" json:"good_name"`
+	SpecificationName string `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	PackingUnit       string `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
+	Remark            string `gorm:"column:remark" json:"remark" form:"remark"`
+}
+
+func (PatientWarehouseInfo) TableName() string {
+	return "xt_warehouse_info"
+}

service/dialysis_service.go

@@ -1219,6 +1219,17 @@ func ModifyExceDoctorAdviceById(m *models.HisDoctorAdviceInfo, ids []string) (er
 	return err
 }
 
+func ModifyHisPrescriptionProject(m *models.HisPrescriptionProject, ids []string) (err error) {
+	ut := writeDb.Begin()
+	err = ut.Model(&models.HisPrescriptionProject{}).Where("status = 1   AND id IN (?) AND execution_state = 1", ids).Updates(map[string]interface{}{"execution_time": m.ExecutionTime}).Error
+	if err != nil {
+		ut.Rollback()
+		return
+	}
+	ut.Commit()
+	return err
+}
+
 func FindHisProjectById(orgID int64, id int64) (advice models.HisPrescriptionProject, err error) {
 	err = readDb.Model(&models.HisPrescriptionProject{}).Where("user_org_id=? and status=1 and id = ?", orgID, id).First(&advice).Error
 	return

service/doctor_schedule_service.go

@@ -598,7 +598,7 @@ func GetPatientSchedule(startime int64, zoneid int64, classtype int64, orgid int
 	return schedule, err
 }
 
-func GetPatientScheduleByBed(schedule_date int64, zoneid int64, orgid int64) (list []*models.PatientDeviceNumber, err error) {
+func GetPatientScheduleByBed(schedule_date int64, zoneid int64, orgid int64, class_type int64) (list []*models.PatientDeviceNumber, err error) {
 
 	db := XTReadDB().Table("xt_device_number as x").Where("x.status = 1")
 	if zoneid > 0 {
@@ -607,9 +607,15 @@ func GetPatientScheduleByBed(schedule_date int64, zoneid int64, orgid int64) (li
 	if orgid > 0 {
 		db = db.Where("x.org_id = ?", orgid)
 	}
-	err = db.Select("x.id,x.number,x.sort,x.group_id,x.zone_id,x.sort").Preload("DeviceZone", "status = 1").Preload("Schedule", func(db *gorm.DB) *gorm.DB {
-		return XTReadDB().Model(&models.BlodSchedule{}).Where("status = 1 AND user_org_id = ? and schedule_date = ?", orgid, schedule_date).Preload("VmBloodPatients", "status = 1 and user_org_id = ?", orgid).Preload("BloodDialysisOrder", "status = 1").Preload("BloodDialysisPrescription", "status = 1")
-	}).Find(&list).Error
+	if class_type > 0 {
+		err = db.Select("x.id,x.number,x.sort,x.group_id,x.zone_id,x.sort").Preload("DeviceZone", "status = 1").Preload("Schedule", func(db *gorm.DB) *gorm.DB {
+			return XTReadDB().Model(&models.BlodSchedule{}).Where("status = 1 AND user_org_id = ? and schedule_date = ? and schedule_type = ?", orgid, schedule_date, class_type).Preload("VmBloodPatients", "status = 1 and user_org_id = ?", orgid).Preload("BloodDialysisOrder", "status = 1 and dialysis_date = ?", schedule_date).Preload("BloodDialysisPrescription", "status = 1 and record_date = ?", schedule_date)
+		}).Find(&list).Error
+	} else {
+		err = db.Select("x.id,x.number,x.sort,x.group_id,x.zone_id,x.sort").Preload("DeviceZone", "status = 1").Preload("Schedule", func(db *gorm.DB) *gorm.DB {
+			return XTReadDB().Model(&models.BlodSchedule{}).Where("status = 1 AND user_org_id = ? and schedule_date = ?", orgid, schedule_date).Preload("VmBloodPatients", "status = 1 and user_org_id = ?", orgid).Preload("BloodDialysisOrder", "status = 1 and dialysis_date = ?", schedule_date).Preload("BloodDialysisPrescription", "status = 1 and record_date = ?", schedule_date)
+		}).Find(&list).Error
+	}
 
 	return list, err
 }
@@ -642,8 +648,9 @@ func GetSearchPatient(keywords string, orgid int64, startime int64) (schedule []
 
 	likeKey := "%" + keywords + "%"
 	db := XTReadDB().Table("xt_schedule as s")
-	err = db.Preload("DeviceZone", " status= 1").Preload("DeviceNumber", "status= 1").
-		Preload("DialysisOrder", "status =1").
+	err = db.Preload("DeviceZone", " status= 1").Preload("DeviceNumber", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status =1").Preload("DeviceZone", "status = 1")
+	}).Preload("DialysisOrder", "status =1").
 		Joins("JOIN xt_patients as p ON p.id = s.patient_id And(p.name LIKE ? OR p.dialysis_no LIKE ?)", likeKey, likeKey).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
 	return schedule, err
@@ -668,10 +675,17 @@ func UpdateStaffScheduleOne(nextid int64, schedule models.WeekSchedule) error {
 	return err
 }
 
-func UpdatedSchedule(schedule models.XtSchedule, id int64) error {
+func UpdatedScheduleMode(schedule models.XtSchedule, id int64) error {
+
+	xtSchedule := models.XtSchedule{}
+	err := XTWriteDB().Model(&xtSchedule).Where("id = ? and status =1 ", id).Updates(map[string]interface{}{"mode_id": schedule.ModeId}).Error
+	return err
+}
+
+func UpdatedSchedule(schedule models.XtSchedule, patient_id int64, schedule_date int64, schedule_type int64, bed_id int64) error {
 
 	xtSchedule := models.XtSchedule{}
-	err := XTWriteDB().Model(&xtSchedule).Where("id = ? and status =1", id).Updates(map[string]interface{}{"schedule_type": schedule.ScheduleType, "mode_id": schedule.ModeId}).Error
+	err := XTWriteDB().Model(&xtSchedule).Where("patient_id = ? and status =1 and schedule_date = ?  and bed_id = ?", patient_id, schedule_date, bed_id).Updates(map[string]interface{}{"schedule_type": schedule.ScheduleType, "mode_id": schedule.ModeId}).Error
 	return err
 }
 
@@ -679,25 +693,45 @@ func GetDialyisSolution(patientid int64, recorddate int64) (*models.DialysisPres
 
 	prescription := models.DialysisPrescription{}
 
-	err := XTReadDB().Model(&prescription).Where("patient_id = ? and record_date = ? and status = 1", patientid, recorddate).Find(&prescription).Error
+	err := XTReadDB().Where("patient_id = ? and record_date = ? and status = 1", patientid, recorddate).Find(&prescription).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, err
+		} else {
+			return nil, err
+		}
+	}
+	return &prescription, nil
+}
+
+func GetPatientScheduleIsExist(startime int64, schedule_type int64, bed_id int64) (*models.Schedule, error) {
+
+	schedule := models.Schedule{}
+	err := XTReadDB().Model(&schedule).Where("schedule_date = ? and schedule_type = ? and bed_id = ? and status = 1", startime, schedule_type, bed_id).Find(&schedule).Error
 	if err == gorm.ErrRecordNotFound {
 		return nil, err
 	}
 	if err != nil {
 		return nil, err
 	}
-	return &prescription, nil
+	return &schedule, nil
 }
 
-func CreateDialysisPrescription(prescription models.DialysisPrescription) error {
+func CreateDialysisPrescription(prescription *models.DialysisPrescription) error {
 
 	err := XTReadDB().Create(&prescription).Error
 
 	return err
 }
 
-func UpdateDialysisPrescriptionOne(prescription models.DialysisPrescription, patientid int64, recordate int64) error {
+func CreateDialysisSolution(solution models.DialysisSolution) error {
+
+	err := XTReadDB().Create(&solution).Error
+	return err
+}
+
+func UpdateDialysisPrescriptionOne(prescription models.DialysisPrescription, patientid int64, recordate int64, mode_id int64) error {
 
-	err := XTReadDB().Model(&prescription).Where("patient_id = ? and record_date = ? and status = 1", patientid, recordate).Updates(map[string]interface{}{"dialyzers": prescription.Dialyzer, "dialyzer_perfusion_apparatus": prescription.DialyzerPerfusionApparatus}).Error
+	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
 }

service/gobal_config_service.go

@@ -166,9 +166,9 @@ func FindAdviceInitConfig(org_id int64) (adviceInit models.AdviceInit, err error
 func GetPrint(ids []int64, orgid int64) (doctor []*models.DoctorAdvice, err error) {
 
 	if len(ids) == 1 {
-		err = XTReadDB().Model(&doctor).Where("groupno = ? and user_org_id = ?", ids[0], orgid).Find(&doctor).Error
+		err = XTReadDB().Model(&doctor).Where("groupno = ? and user_org_id = ? and status = 1", ids[0], orgid).Find(&doctor).Error
 	} else {
-		err = XTReadDB().Model(&doctor).Where("groupno IN(?) and user_org_id = ?", ids, orgid).Find(&doctor).Error
+		err = XTReadDB().Model(&doctor).Where("groupno IN(?) and user_org_id = ? and status = 1", ids, orgid).Find(&doctor).Error
 	}
 
 	return doctor, err

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -267,7 +267,7 @@ type AssessmentBeforeDislysisVM struct {
 	DuctusArantii                  string  `gorm:"column:ductus_arantii" json:"ductus_arantii"`
 	EmergencyTreatment             int64   `gorm:"column:emergency_treatment" json:"emergency_treatment"`
 	EmergencyTreatmentOther        string  `gorm:"column:emergency_treatment_other" json:"emergency_treatment_other"`
-	DialysisCount                  int64   `gorm:"column:dialysis_count" json:"dialysis_count"`
+	DialysisCount                  string  `gorm:"column:dialysis_count" json:"dialysis_count"`
 	AssessmentDoctor               int64   `gorm:"column:assessment_doctor" json:"assessment_doctor"`
 	AssessmentTime                 int64   `gorm:"column:assessment_time" json:"assessment_time"`
 	MachineType                    string  `gorm:"column:machine_type" json:"machine_type"`

service/schedule_service.go

@@ -605,12 +605,10 @@ func GetWeekDayScheduleByIdThee(orgid int64, scheduleDate int64, scheduleType in
 		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").Preload("XtAssessmentBeforeDislysis", "status = 1").Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status =1 and parent_id = 0").Preload("ChildDoctorAdvice", "status = 1")
-	}).Preload("HisDoctorAdviceInfo", "status = 1").Preload("DialysisPrescription", "status = 1").Preload("DialysisSolution", 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").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")
-	}).Preload("Solution", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status =1").Group("patient_id,mode_id").Order("id asc")
 	}).Find(&list).Error
 
 	return list, err
@@ -632,12 +630,10 @@ 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").Preload("XtAssessmentBeforeDislysis", "status = 1").Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status =1 and parent_id = 0").Preload("ChildDoctorAdvice", "status = 1")
-	}).Preload("HisDoctorAdviceInfo", "status = 1").Preload("DialysisPrescription", "status = 1").Preload("DialysisSolution", 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").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")
-	}).Preload("Solution", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status =1").Group("patient_id,mode_id").Order("id desc")
 	}).Find(&list).Error
 
 	return list, err
@@ -824,8 +820,6 @@ func GetNextWeekDaySchedule(weektype int64, weektime int64, startime int64, endt
 			return db.Where("status = 1").Order("id asc")
 		}).Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1").Order("id asc")
-	}).Preload("Solution", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status = 1").Group("patient_id,mode_id").Order("id asc")
 	}).Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status =1 and parent_id = 0").Preload("ChildDoctorAdvice", "status = 1")
 	}).Preload("HisDoctorAdviceInfo", "status = 1").Joins("JOIN xt_patients as p ON p.id = s.patient_id").

service/self_drug_service.go

@@ -1126,7 +1126,7 @@ func CreateDrugWarehouseOutInfo(info models.DrugWarehouseOutInfo) error {
 
 func GetDamageByDrugId(drugid int64, warhousingorder string, drugtype int64) (drug []*models.VmXtDrugInventory, err error) {
 
-	db := XTReadDB().Table("xt_drug_inventory").Where("status = 1 and type = 4 ")
+	db := XTReadDB().Table("xt_drug_inventory").Where("status = 1")
 
 	if drugid > 0 {
 		db = db.Where("drug_id = ?", drugid)
@@ -1137,7 +1137,22 @@ func GetDamageByDrugId(drugid int64, warhousingorder string, drugtype int64) (dr
 	if drugtype > 0 {
 		db = db.Where("type = ?", drugtype)
 	}
+	if drugtype == 0 {
+		db = db.Where("type = 4")
+	}
 
 	err = db.Preload("XtBaseDrug", "status = 1").Find(&drug).Error
 	return drug, err
 }
+
+func GetInventoryModeList(orgid int64) (info []*models.PatientDrugWarehouseInfo, err error) {
+
+	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")
+	table := XTReadDB().Table("xt_base_drug as t").Where("t.status = 1")
+	fmt.Println(table)
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	err = db.Select("x.drug_id,x.number,x.product_date,x.expiry_date,x.stock_max_number,x.stock_min_number,x.batch_number,t.drug_name,t.max_unit,t.min_unit,t.min_number,t.dose,t.dose_unit,x.manufacturer,x.dealer").Joins("left join xt_base_drug as t on t.id = x.drug_id").Group("x.drug_id,x.batch_number").Scan(&info).Error
+	return info, err
+}

service/stock_service.go

@@ -1158,7 +1158,7 @@ func FindReturnInfoById(id int64) (list []*models.SalesReturnInfo, err error) {
 }
 
 func FindCancelStockInfoById(id int64) (list []*models.CancelStockInfo, err error) {
-	err = readDb.Model(&models.CancelStockInfo{}).Where("cancel_stock_id = ? AND status = 1", id).Preload("GoodInfo", "status = 1").Find(&list).Error
+	err = readDb.Model(&models.CancelStockInfo{}).Where("cancel_stock_id = ? AND status = 1", id).Preload("WarehousingInfo", "status = 1").Preload("GoodInfo", "status = 1").Find(&list).Error
 	return list, err
 }
 
@@ -1551,6 +1551,12 @@ func GetLastCancelStockById(orgid int64) (models.CancelStock, error) {
 	return stock, err
 }
 
+func GetLastDrugCancelStockById(orgid int64) (models.DrugCancelStock, error) {
+	stock := models.DrugCancelStock{}
+	err := XTReadDB().Where("org_id = ? and status = 1", orgid).Last(&stock).Error
+	return stock, err
+}
+
 func AddSigleDrugCancelStock(cancelStock *models.DrugCancelStock) error {
 	err := writeDb.Create(&cancelStock).Error
 	return err
@@ -3190,9 +3196,13 @@ func GetSearchDrugList(keywords string, orgid int64) (drug []*models.BaseDrugLib
 	db := XTReadDB().Model(&drug).Where("org_id=? and status=1  and drug_status<>'停用'", orgid)
 	if len(keywords) > 0 {
 		likekey := "%" + keywords + "%"
-		err = db.Where("(drug_name LIKE ?)", likekey).Find(&drug).Error
+		err = db.Where("(drug_name LIKE ?)", likekey).Preload("DrugWarehouseInfo", func(db *gorm.DB) *gorm.DB {
+			return XTReadDB().Where("org_id=? and status = 1 and warehousing_count <> 0", orgid).Group("id")
+		}).Find(&drug).Error
 	} else {
-		err = db.Find(&drug).Error
+		err = db.Preload("DrugWarehouseInfo", func(db *gorm.DB) *gorm.DB {
+			return XTReadDB().Where("org_id=? and status = 1 and warehousing_count <> 0", orgid).Group("id")
+		}).Find(&drug).Error
 	}
 	return
 }
@@ -3206,7 +3216,9 @@ func GetSearchGoodList(keywords string, orgid int64) (good []*models.GoodInfo, e
 			return XTReadDB().Where("org_id=? and status = 1 and warehousing_count <> 0", orgid)
 		}).Find(&good).Error
 	} else {
-		err = db.Find(&good).Error
+		err = db.Preload("StWarehousingInfo", func(db *gorm.DB) *gorm.DB {
+			return XTReadDB().Where("org_id=? and status = 1 and warehousing_count <> 0", orgid)
+		}).Find(&good).Error
 	}
 	return
 }
@@ -3881,6 +3893,21 @@ func GetWarehoureOrderInfoCount(goodid int64, orgid int64, id int64) (info model
 	return info, err
 }
 
+func GetWarehoureOrderStockOutFlow(goodid int64, orgid int64, id int64) (info models.VmStockFlow, err error) {
+	db := XTReadDB().Table("xt_stock_flow as x").Where("x.status =1 and x.consumable_type = 2 or x.consumable_type = 3")
+	if goodid > 0 {
+		db = db.Where("x.good_id = ?", goodid)
+	}
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ?", orgid)
+	}
+	if id > 0 {
+		db = db.Where("x.warehousing_id = ?", id)
+	}
+	err = db.Select("x.good_id,sum(x.count) as count").Scan(&info).Error
+	return info, err
+}
+
 func UpdateCancelInfo(id int64) (models.CancelStock, error) {
 	stock := models.CancelStock{}
 	err := XTWriteDB().Model(&stock).Where("id=? and status = 1", id).Updates(map[string]interface{}{"status": 0}).Error
@@ -4994,3 +5021,15 @@ func UpdatedStockFlowByGoodId(warehousing_id int64, good_id int64, flow models.V
 	err := XTWriteDB().Model(&flow).Where("warehousing_id = ? and good_id = ? and status = 1", warehousing_id, good_id).Updates(map[string]interface{}{"count": flow.Count}).Error
 	return err
 }
+
+func GetInventoryExportList(orgid int64) (info []*models.PatientWarehouseInfo, err error) {
+
+	db := XTReadDB().Table("xt_warehouse_info as x").Where("x.status = 1")
+	table := XTReadDB().Table("xt_good_information as t").Where("t.status = 1")
+	fmt.Println(table)
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	err = db.Select("x.id,x.good_id,x.number,x.number,x.product_date,x.expiry_date,x.warehousing_unit,x.dealer,x.manufacturer,t.good_name,t.specification_name,t.packing_unit,t.remark").Joins("left join xt_good_information as t on t.id = x.good_id").Group("x.good_id,x.number").Scan(&info).Error
+	return info, err
+}