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

controllers/base_api_controller.go

@@ -73,7 +73,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		var userAdmin models.AdminUser
 		userAdmin.Id = 16919
 		userAdmin.Mobile = "15717313968"
-		userAdmin.Id = 10612 //4，809
+		userAdmin.Id = 10344 //4，809
 		userAdmin.Mobile = "12222222222"
 		userAdmin.IsSuperAdmin = true
 		userAdmin.Status = 1
@@ -81,7 +81,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10460 //机构id 10344
+		subscibe.OrgId = 10206 //机构id 10344
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -91,7 +91,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10460 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10206 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 17282 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
@@ -326,7 +326,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10460 //机构id小英10344或4
+		subscibe.OrgId = 10206 //机构id小英10344或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -336,7 +336,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10460 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10206 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 17282 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/gobal_config_api_controller.go

@@ -1839,6 +1839,7 @@ func (c *GobalConfigApiController) GetDrugOutDetail() {
 	limit, _ := c.GetInt64("limit")
 	page, _ := c.GetInt64("page")
 	order, total, err := service.GetDrugOutOrder(startTime, endTime, adminInfo.CurrentOrgId, order_type, manufacturer_id, keyword, page, limit, storehouse_id)
+
 	houseList, _ := service.GetAllStoreHouseList(adminInfo.CurrentOrgId)
 	patientsList, _ := service.GetAllpatient(adminInfo.CurrentOrgId)
 	var drugType = "药品类型"

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -1206,25 +1206,23 @@ func (c *CheckWeightApiController) GetPatientInfoDialysis() {
 	// 获取当前或者下次排班信息
 	var sc map[string]interface{}
 	sc = make(map[string]interface{})
-	var mode_id int64
 	if dialysistype == 1 {
 		daySchedule, _ := service.GetPatientScheduleFormDay(adminUserInfo.Org.Id, startTime, endTime, id)
-		println(daySchedule[0].Schedule.ModeId)
 		if len(daySchedule) <= 0 {
 			sc["code"] = 1
 			sc["msg"] = "抱歉，您今天没有排版！"
-			mode_id = 0
+			sc["mode"] = 0
 			sc["data"] = daySchedule
 		} else {
 			if daySchedule[0].Schedule.ID > 0 {
 				sc["code"] = 0
 				sc["msg"] = ""
-				mode_id = daySchedule[0].Schedule.ModeId
+				sc["mode"] = daySchedule[0].Schedule.ModeId
 				sc["data"] = daySchedule
 			} else {
 				sc["code"] = 1
 				sc["msg"] = "抱歉，您今天没有排版！"
-				mode_id = 0
+				sc["mode"] = 0
 				sc["data"] = daySchedule
 			}
 		}
@@ -1241,24 +1239,24 @@ func (c *CheckWeightApiController) GetPatientInfoDialysis() {
 		if len(nextSchedule) <= 0 {
 			sc["code"] = 1
 			sc["msg"] = "抱歉，您后续没有排版！"
-			mode_id = 0
+			sc["mode"] = 0
 			sc["data"] = nextSchedule
 		} else {
 			if nextSchedule[0].Schedule.ID > 0 {
 				sc["code"] = 0
 				sc["msg"] = ""
-				mode_id = nextSchedule[0].Schedule.ModeId
+				sc["mode"] = nextSchedule[0].Schedule.ModeId
 				sc["data"] = nextSchedule
 			} else {
 				sc["code"] = 1
 				sc["msg"] = "抱歉，您后续没有排版！"
-				mode_id = 0
+				sc["mode"] = 0
 				sc["data"] = nextSchedule
 			}
 		}
 	}
 
-	switch mode_id {
+	switch sc["mode"] {
 	case 1:
 		sc["mode"] = "HD"
 		break

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1666,22 +1666,22 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 				//
 				fmt.Println("config.IsOpen", config.IsOpen)
 				fmt.Println("config.IsOpen", item.UserOrgId)
-				if config.IsOpen == 1 && item.UserOrgId == 10028 {
-
-					service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
-					//更新字典里面的库存
-					stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
-					var sum_count int64
-					for _, its := range stockInfo {
-						if its.MaxUnit == medical.MaxUnit {
-							its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
-						}
-						sum_count += its.StockMaxNumber + its.StockMinNumber
-					}
-					service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
-					//剩余库存
-					service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
-				}
+				//if config.IsOpen == 0 && item.UserOrgId == 10402 {
+				//
+				//	service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
+				//	//更新字典里面的库存
+				//	stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+				//	var sum_count int64
+				//	for _, its := range stockInfo {
+				//		if its.MaxUnit == medical.MaxUnit {
+				//			its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+				//		}
+				//		sum_count += its.StockMaxNumber + its.StockMinNumber
+				//	}
+				//	service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
+				//	//剩余库存
+				//	service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
+				//}
 
 			}
 		}

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -516,6 +516,13 @@ func (this *StaffScheduleApiController) DeleteSchedule() {
 				service.UpdateAdviceObj(schedule.PatientId, schedule.ScheduleDate, org_id)
 			}
 		}
+
+		if org_id == 10206 {
+			advice, _ := service.GetHisDoctorAdviceListTwenty(schedule.PatientId, schedule.ScheduleDate, org_id)
+			if len(advice) > 0 {
+				service.UpdateHisAdviceObj(schedule.PatientId, schedule.ScheduleDate, org_id)
+			}
+		}
 		redis := service.RedisClient()
 		//处方
 		keyOne := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":prescriptions_list_all"

controllers/patient_api_controller.go

@@ -3290,9 +3290,12 @@ func (c *PatientApiController) UpdateDoctorAdvice() {
 	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeLongTimeAdviceNotCanntEdit)
 	//	return
 	//}
-	if advice.StopState == 1 || advice.ExecutionState == 1 {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceStoped)
-		return
+
+	if adminUserInfo.CurrentOrgId != 10612 && adminUserInfo.CurrentOrgId != 10460 {
+		if advice.StopState == 1 || advice.ExecutionState == 1 {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceStoped)
+			return
+		}
 	}
 
 	//appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)

controllers/schedule_api_controller.go

@@ -98,15 +98,25 @@ func (c *ScheduleApiController) CoverSch() {
 	id_two, _ := c.GetInt64("id_two")
 	sch, _ := service.GetScheduleTen(c.GetAdminUserInfo().CurrentOrgId, id_one)
 	sch_two, _ := service.GetScheduleTen(c.GetAdminUserInfo().CurrentOrgId, id_two)
+	//order, _ := service.GetDialysisOrder(sch.ScheduleDate, sch.PatientId, sch.UserOrgId)
+	//if order.ID > 0 {
+	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientDialysisOrderOne)
+	//	return
+	//}
 	order, _ := service.GetDialysisOrder(sch.ScheduleDate, sch.PatientId, sch.UserOrgId)
 	if order.ID > 0 {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientDialysisOrderOne)
-		return
-	}
-	order2, _ := service.GetDialysisOrder(sch_two.ScheduleDate, sch_two.PatientId, sch_two.UserOrgId)
-	if order2.ID > 0 {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientDialysisOrderTwo)
-		return
+
+		service.UpdateDialysiOrderByPatientId(id_two, sch_two.ScheduleType, sch_two.PartitionId, sch_two.BedId)
+		redis := service.RedisClient()
+		key := strconv.FormatInt(sch_two.UserOrgId, 10) + ":" + strconv.FormatInt(sch_two.PatientId, 10) + ":" + strconv.FormatInt(sch_two.ScheduleDate, 10) + ":dialysis_order"
+		redis.Set(key, "", time.Second)
+		keyOne := strconv.FormatInt(sch_two.UserOrgId, 10) + ":" + strconv.FormatInt(sch_two.ScheduleDate, 10) + ":dialysis_orders_list_all"
+
+		//清空key 值
+		redis.Set(keyOne, "", time.Second)
+
+		//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientDialysisOrderTwo)
+		//return
 	}
 	//替换者和被替换的排班日期不是同一天，则进行一个患者一天不能有多个排班提醒
 	if sch.ScheduleDate != sch_two.ScheduleDate && sch.PatientId != sch_two.PatientId {
@@ -154,16 +164,12 @@ func (c *ScheduleApiController) ExchangeSch() {
 	id_two, _ := c.GetInt64("id_two")
 	sch, _ := service.GetSchedule(c.GetAdminUserInfo().CurrentOrgId, id_one)
 	sch_two, _ := service.GetSchedule(c.GetAdminUserInfo().CurrentOrgId, id_two)
-	order, _ := service.GetDialysisOrder(sch.ScheduleDate, sch.PatientId, sch.UserOrgId)
-	if order.ID > 0 {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientDialysisOrderOne)
-		return
-	}
-	order2, _ := service.GetDialysisOrder(sch_two.ScheduleDate, sch_two.PatientId, sch_two.UserOrgId)
-	if order2.ID > 0 {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientDialysisOrderTwo)
-		return
-	}
+
+	//order2, _ := service.GetDialysisOrder(sch_two.ScheduleDate, sch_two.PatientId, sch_two.UserOrgId)
+	//if order2.ID > 0 {
+	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientDialysisOrderTwo)
+	//	return
+	//}
 
 	//替换者和被替换的排班日期不是同一天，则进行一个患者一天不能有多个排班提醒
 	if sch.ScheduleDate != sch_two.ScheduleDate && sch.PatientId != sch_two.PatientId {
@@ -181,6 +187,22 @@ func (c *ScheduleApiController) ExchangeSch() {
 	}
 
 	err := service.UpdateScheduleThree(sch, sch_two)
+
+	order, _ := service.GetDialysisOrder(sch.ScheduleDate, sch.PatientId, sch.UserOrgId)
+	if order.ID > 0 {
+		//查询该患者的排班机位
+		pSchedule, _ := service.GetPscheduleDate(sch.ScheduleDate, sch.PatientId, sch.UserOrgId)
+		service.UpdateDialysiOrderByPatientId(id_two, pSchedule.ScheduleType, pSchedule.PartitionId, pSchedule.BedId)
+		redis := service.RedisClient()
+		key := strconv.FormatInt(sch_two.UserOrgId, 10) + ":" + strconv.FormatInt(sch_two.PatientId, 10) + ":" + strconv.FormatInt(sch_two.ScheduleDate, 10) + ":dialysis_order"
+		redis.Set(key, "", time.Second)
+		keyOne := strconv.FormatInt(sch_two.UserOrgId, 10) + ":" + strconv.FormatInt(sch_two.ScheduleDate, 10) + ":dialysis_orders_list_all"
+
+		//清空key 值
+		redis.Set(keyOne, "", time.Second)
+		//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientDialysisOrderOne)
+		//return
+	}
 	if err == nil {
 
 		//去除当天患者排班中重复数据，保留最后一条数据
@@ -1667,16 +1689,16 @@ func (c *ScheduleApiController) CreateScheduleTwo() {
 		return
 	}
 
-	order, err := service.GetOneDialysisOrder(adminINfo.CurrentOrgId, schedule_two.ScheduleDate, schedule_two.PatientId)
-	if err != nil {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	}
-
-	if order != nil {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDelScheduleFailByDialysis)
-		return
-	}
+	//order, err := service.GetOneDialysisOrder(adminINfo.CurrentOrgId, schedule_two.ScheduleDate, schedule_two.PatientId)
+	//if err != nil {
+	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//	return
+	//}
+	//
+	//if order != nil {
+	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDelScheduleFailByDialysis)
+	//	return
+	//}
 
 	schedule_two.Status = 0
 	schedule_two.UpdatedTime = time.Now().Unix()
@@ -1696,7 +1718,7 @@ func (c *ScheduleApiController) CreateScheduleTwo() {
 	var schedule models.Schedule
 	dataBody := make(map[string]interface{}, 0)
 
-	err = json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
 	if err != nil {
 		utils.ErrorLog(err.Error())
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -1858,6 +1880,7 @@ func (c *ScheduleApiController) CreateScheduleTwo() {
 	//}
 	//同天同位置只能排一个
 	pointSchedule, err := service.GetPointSchedule(adminUserInfo.CurrentOrgId, schedule.ScheduleDate, schedule.ScheduleWeek, schedule.ScheduleType, schedule.BedId)
+
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return
@@ -1867,9 +1890,26 @@ func (c *ScheduleApiController) CreateScheduleTwo() {
 		return
 	}
 	schedule.IsExport = 1000
+
 	err = service.CreateSchedule(&schedule, id)
 
 	lastSchedule, _ := service.GetLastSchedule(patientID, adminUserInfo.CurrentOrgId)
+
+	//查询上机床位号 更改床位号
+	order, err := service.GetOneDialysisOrder(adminINfo.CurrentOrgId, schedule_two.ScheduleDate, schedule_two.PatientId)
+
+	if order.ID > 0 {
+		service.UpdateDialysiOrderByPatientId(order.ID, schedule.ScheduleType, schedule.PartitionId, order.BedID)
+		redis := service.RedisClient()
+		key := strconv.FormatInt(adminINfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":dialysis_order"
+		redis.Set(key, "", time.Second)
+		keyOne := strconv.FormatInt(adminINfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":dialysis_orders_list_all"
+
+		//清空key 值
+		redis.Set(keyOne, "", time.Second)
+
+	}
+
 	if err == nil {
 		redis := service.RedisClient()
 		key := "scheduals_" + scheduleDate + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
@@ -1976,6 +2016,13 @@ func (c *ScheduleApiController) DeleteSchedule() {
 		}
 	}
 
+	if adminINfo.CurrentOrgId == 10206 {
+		advice, _ := service.GetHisDoctorAdviceListTwenty(schedule.PatientId, schedule.ScheduleDate, adminINfo.CurrentOrgId)
+		if len(advice) > 0 {
+			service.UpdateHisAdviceObj(schedule.PatientId, schedule.ScheduleDate, adminINfo.CurrentOrgId)
+		}
+	}
+
 	redis := service.RedisClient()
 
 	//处方

controllers/sign_api_controller.go

@@ -8,7 +8,6 @@ import (
 	"fmt"
 	"github.com/astaxie/beego"
 	"github.com/jung-kurt/gofpdf"
-	"github.com/mozillazg/go-pinyin"
 	"io/ioutil"
 	"time"
 )
@@ -665,32 +664,37 @@ func (this *SignApiController) GetEnterPriseDetail() {
 
 func (this *SignApiController) UploadPrintOrder() {
 
-	list, _ := service.GetAllPatientNew(10579)
-	for _, item := range list {
-
-		hans := item.Name // 要转换的汉字字符串
-		// 创建一个拼音转换器
-		p := pinyin.NewArgs()
-
-		// 将汉字转为拼音
-		pinyinSlice := pinyin.Pinyin(hans, p)
-
-		// 输出拼音
-		fmt.Println("Pinyin:", pinyinSlice)
+	orderList, _ := service.GetWarehouseOutOrderList()
 
-		// 获取首字母
-		firstLetter := ""
-		for _, py := range pinyinSlice {
-			if len(py) > 0 {
-				firstLetter += string(py[0][0])
-			}
-		}
-
-		item.FirstLetter = firstLetter
-		service.UpdatePatientNew(item.ID, item.FirstLetter)
-		// 输出首字母
-		//fmt.Println("First Letter:", firstLetter)
+	for _, item := range orderList {
+		service.UpdateWarehouseOutOrderInfo(item.ID, item.WarehouseOutOrderNumber)
 	}
+	//list, _ := service.GetAllPatientNew(10318)
+	//for _, item := range list {
+	//
+	//	hans := item.Name // 要转换的汉字字符串
+	//	// 创建一个拼音转换器
+	//	p := pinyin.NewArgs()
+	//
+	//	// 将汉字转为拼音
+	//	pinyinSlice := pinyin.Pinyin(hans, p)
+	//
+	//	// 输出拼音
+	//	fmt.Println("Pinyin:", pinyinSlice)
+	//
+	//	// 获取首字母
+	//	firstLetter := ""
+	//	for _, py := range pinyinSlice {
+	//		if len(py) > 0 {
+	//			firstLetter += string(py[0][0])
+	//		}
+	//	}
+	//
+	//	item.FirstLetter = firstLetter
+	//	service.UpdatePatientNew(item.ID, item.FirstLetter)
+	//	// 输出首字母
+	//	//fmt.Println("First Letter:", firstLetter)
+	//}
 
 	//baseList, _ := service.GeteAllBaseList(10587)
 	//for _, item := range baseList {

controllers/stock_in_api_controller.go

@@ -4949,6 +4949,7 @@ func (this *StockManagerApiController) GetOrderDetialByOrderId() {
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	order, _ := service.GetWarehouseOutOrder(idsArray, orgId)
 	list, _ := service.GetOrderDetialByOrderIdOne(idsArray, orgId)
+	fmt.Println("list000000000000000000000000", len(list))
 	stockFlowListGroup, _ := service.GetOrderDetailStockFlowByStorehouseById(idsArray, orgId)
 	stockFlowList, _ := service.GetOrderDetailStockFlow(idsArray, orgId)
 	//获取耗材退库数据
@@ -4970,12 +4971,14 @@ func (this *StockManagerApiController) GetOrderDetailById() {
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	//自动出库
 	userDetails, err, total := service.FindUserDetailByIdOne(good_id, record_time, orgId)
-
+	fmt.Println("userDetails00---------", userDetails)
 	//手动出库
 	info, _ := service.GetWarehouseOutInfoById(id, good_id)
 
 	//出库数据
 	stockFlowList, err := service.GetStockFlowBatchNumberOne(id, good_id)
+
+	fmt.Println("stockFlowList", stockFlowList)
 	//退库数据
 	cancelInfo, err := service.GetStockFlowCancelInfo(id, good_id)
 	if err == nil {

models/self_drug_models.go

@@ -590,6 +590,7 @@ type BloodDrugWarehouseOutInfo struct {
 	InPrice                 float64 `gorm:"column:price" json:"in_price" form:"price"`
 	WarehousingInfoId       int64   `gorm:"column:warehousing_info_id" json:"warehousing_info_id" form:"warehousing_info_id"`
 	PatientId               int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	InforPrice              float64 `json:"infor_price"`
 }
 
 type XtMonitorConfig struct {

service/dialysis_service.go

@@ -1066,6 +1066,22 @@ func GetOneDialysisOrder(orgID, orderData int64, patient_id int64) (*models.Dial
 	return &order, nil
 }
 
+func GetPscheduleDate(schedule_date int64, patient_id int64, user_org_id int64) (models.XtSchedule, error) {
+
+	schedule := models.XtSchedule{}
+
+	err := XTReadDB().Where("schedule_date = ? and patient_id = ? and user_org_id =? and status =1").Find(&schedule).Error
+
+	return schedule, err
+}
+
+func UpdateDialysiOrderByPatientId(id int64, schedule_type int64, partion_id int64, bed_id int64) error {
+
+	err := XTWriteDB().Model(&models.DialysisOrder{}).Where("id = ? and status =1", id).Updates(map[string]interface{}{"schedual_type": schedule_type, "zone_id": partion_id, "bed_id": bed_id}).Error
+
+	return err
+}
+
 func GetOrgInfoTemplate(orgID int64) (models.GobalTemplate, error) {
 	var templateInfo models.GobalTemplate
 	var err error

service/gobal_config_service.go

@@ -396,9 +396,9 @@ func GetDrugOutOrder(startime int64, endtime int64, orgid int64, orderType int64
 
 	db = db.Joins("left join sgj_xt.xt_drug_warehouse_info as p on p.id =x.warehouse_info_id")
 	if manufacturerId > 0 {
-		err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.warehousing_out_target,x.count,x.count_unit,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.remark,x.is_cancel,x.warehouse_out_order_number,x.type,x.dealer,x.manufacturer,x.is_sys,x.sys_record_time,x.retail_price,x.retail_total_price,x.storehouse_id,x.patient_id,b.drug_name,b.drug_spec,b.drug_type,b.min_unit,b.max_unit,b.min_number,b.dose,b.dose_unit,b.last_price,t.creater,p.price").Joins("left join xt_base_drug as b on b.id = x.drug_id and b.org_id = ? and b.status =1", orgid).Joins("left join xt_drug_warehouse_out as t on t.id = x.warehouse_out_id and t.org_id = ? and t.status  =1", orgid).Where("t.manufacturer = ?", manufacturerId).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&outinfo).Error
+		err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.warehousing_out_target,x.count,x.count_unit,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.remark,x.is_cancel,x.warehouse_out_order_number,x.type,x.dealer,x.manufacturer,x.is_sys,x.sys_record_time,x.retail_price,x.retail_total_price,x.storehouse_id,x.patient_id,b.drug_name,b.drug_spec,b.drug_type,b.min_unit,b.max_unit,b.min_number,b.dose,b.dose_unit,b.last_price,t.creater,p.price as infor_price").Joins("left join xt_base_drug as b on b.id = x.drug_id and b.org_id = ? and b.status =1", orgid).Joins("left join xt_drug_warehouse_out as t on t.id = x.warehouse_out_id and t.org_id = ? and t.status  =1", orgid).Where("t.manufacturer = ?", manufacturerId).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&outinfo).Error
 	} else {
-		err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.warehousing_out_target,x.count,x.count_unit,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.remark,x.is_cancel,x.warehouse_out_order_number,x.type,x.dealer,x.manufacturer,x.is_sys,x.sys_record_time,x.retail_price,x.retail_total_price,x.storehouse_id,x.patient_id,b.drug_name,b.drug_spec,b.drug_type,b.min_unit,b.max_unit,b.min_number,b.dose,b.dose_unit,b.last_price,t.creater,p.price").Joins("left join xt_base_drug as b on b.id = x.drug_id and b.org_id = ? and b.status =1", orgid).Joins("left join xt_drug_warehouse_out as t on t.id = x.warehouse_out_id and t.org_id = ? and t.status  =1", orgid).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&outinfo).Error
+		err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.warehousing_out_target,x.count,x.count_unit,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.remark,x.is_cancel,x.warehouse_out_order_number,x.type,x.dealer,x.manufacturer,x.is_sys,x.sys_record_time,x.retail_price,x.retail_total_price,x.storehouse_id,x.patient_id,b.drug_name,b.drug_spec,b.drug_type,b.min_unit,b.max_unit,b.min_number,b.dose,b.dose_unit,b.last_price,t.creater,p.price as infor_price").Joins("left join xt_base_drug as b on b.id = x.drug_id and b.org_id = ? and b.status =1", orgid).Joins("left join xt_drug_warehouse_out as t on t.id = x.warehouse_out_id and t.org_id = ? and t.status  =1", orgid).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&outinfo).Error
 	}
 
 	return outinfo, total, err

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -43,7 +43,7 @@ func GetSchedules(orgID int64, schIDs []string) ([]*ScheduleVM, error) {
 				Order("start_time asc, groupno desc, advice_order desc, id asc")
 		}).
 		Preload("HisAdvices", func(db *gorm.DB) *gorm.DB {
-			return db.Select("id, user_org_id, patient_id, advice_type, advice_date, record_date, start_time, drug_spec_unit,advice_name,advice_desc, reminder_date, drug_spec, drug_spec_unit, single_dose, single_dose_unit, prescribing_number, prescribing_number_unit, delivery_way, execution_frequency, advice_doctor, status, created_time,updated_time, advice_affirm, remark, stop_time, stop_reason, stop_doctor, stop_state, parent_id, execution_time, execution_staff, execution_state, checker, check_state, check_time, groupno, IF(parent_id > 0, parent_id, id) as advice_order").
+			return db.Select("id, user_org_id, patient_id, advice_type, advice_date, record_date, start_time, drug_spec_unit,advice_name,advice_desc, reminder_date, drug_spec, drug_spec_unit, single_dose, single_dose_unit, prescribing_number, prescribing_number_unit, delivery_way, execution_frequency, advice_doctor, status, created_time,updated_time, advice_affirm, remark, stop_time, stop_reason, stop_doctor, stop_state, parent_id, execution_time, execution_staff, execution_state, checker, check_state, check_time,prescription_id, groupno, IF(parent_id > 0, parent_id, id) as advice_order").
 				Where("user_org_id = ? AND status = 1", orgID).
 				Order("start_time asc, groupno desc, advice_order desc, id asc")
 		}).

service/schedule_service.go

@@ -1769,12 +1769,24 @@ func GetDoctorAdviceListTwenty(patient_id int64, schedule_date int64, user_org_i
 	return advice, err
 }
 
+func GetHisDoctorAdviceListTwenty(patient_id int64, schedule_date int64, user_org_id int64) (advice []*models.HisDoctorAdvice, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and advice_date = ? and user_org_id = ? and status=1", patient_id, schedule_date, user_org_id).Find(&advice).Error
+	return advice, err
+}
+
 func UpdateAdviceObj(patient_id int64, schedule_date int64, user_org_id int64) (err error) {
 
 	err = XTWriteDB().Model(&models.XtDoctorAdvice{}).Where("patient_id = ? and advice_date =? and status=1 and user_org_id = ?", patient_id, schedule_date, user_org_id).Updates(map[string]interface{}{"status": 9}).Error
 	return err
 }
 
+func UpdateHisAdviceObj(patient_id int64, schedule_date int64, user_org_id int64) (err error) {
+
+	err = XTWriteDB().Model(&models.HisDoctorAdvice{}).Where("patient_id = ? and advice_date =? and status=1 and user_org_id = ?", patient_id, schedule_date, user_org_id).Updates(map[string]interface{}{"status": 9}).Error
+	return err
+}
+
 func GetLastSchedule(patient_id int64, user_org_id int64) (models.XtSchedule, error) {
 
 	schedule := models.XtSchedule{}

service/sign_service.go

@@ -2099,7 +2099,7 @@ func UpdateSchPatient(patient_id int64, schedule_date int64, user_org_id int64,
 
 func GetNewAllpatient(org_id int64) (list []*models.XtPatientsNew, err error) {
 
-	err = XTReadDB().Where("status =1 and user_org_id =10567").Find(&list).Error
+	err = XTReadDB().Where("status =1 and user_org_id =10265").Find(&list).Error
 
 	return list, err
 }
@@ -2200,3 +2200,15 @@ func UpdateHisDoctorAdviceOne(drug_id int64, retail_price float64, user_org_id i
 	err := XTWriteDB().Model(&models.HisDoctorAdvice{}).Where("drug_id = ? and user_org_id = ?  and status=1", drug_id, user_org_id).Updates(map[string]interface{}{"price": retail_price}).Error
 	return advice, err
 }
+
+func GetWarehouseOutOrderList() (out []*models.WarehouseOut, err error) {
+
+	err = XTReadDB().Where("status=1").Find(&out).Error
+	return out, err
+}
+
+func UpdateWarehouseOutOrderInfo(id int64, warehouse_out_order_number string) error {
+
+	err := XTWriteDB().Model(&models.WarehouseOutInfo{}).Where("warehouse_out_id = ? and status=1", id).Updates(map[string]interface{}{"warehouse_out_order_number": warehouse_out_order_number}).Error
+	return err
+}