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

controllers/dialysis_api_controller.go

@@ -2968,7 +2968,7 @@ func (c *DialysisApiController) GetDialysisOrder() {
 	}
 	if adminUserInfo.CurrentOrgId == 10101 || adminUserInfo.CurrentOrgId == 10445 || adminUserInfo.CurrentOrgId == 10345 {
 
-		if xttime <= 1640966400 {
+		if xttime <= 1672416000 {
 			dialysis_count, _ := service.GetDialysisOrderCountOne(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 			patientInfo.TotalDialysis = dialysis_count
 		}

controllers/his_api_controller.go

@@ -6645,7 +6645,6 @@ func (c *HisApiController) Refund() {
 			infos = append(infos, &info.HisDoctorAdviceInfo)
 		}
 		if info.ProjectId > 0 && info.AdviceId == 0 {
-			fmt.Println("info232323233232233", order_id)
 			if info.HisPrescriptionProject.Type == 3 {
 				var good models.DialysisBeforePrepareGoods
 				var newGood models.NewDialysisBeforePrepareGoods

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -665,6 +665,9 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				if adminUserInfo.Org.Id == 10340 {
 					evaluation.BreathingRate = "20"
 				}
+				if adminUserInfo.Org.Id == 10445 {
+					evaluation.VenousCatheterization = lastPredialysisEvaluation.VenousCatheterization
+				}
 			}
 		} else {
 			evaluation.UpdatedTime = time.Now().Unix()

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -531,6 +531,7 @@ func (this *DialysisAPIController) DialysisRecord() {
 	temp_team_projects, _ := service.GetHisPrescriptionTeamProjects(adminInfo.Org.Id, patientID, date.Unix())
 
 	prescriptionConfig, _ := service.FindPrescriptionConfigById(adminInfo.Org.Id)
+
 	var team_projects []*models.HisPrescriptionProject
 	//var index int64 = 0
 	for _, item := range temp_team_projects {

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -2873,6 +2873,25 @@ func (this *NewDialysisApiController) GetTreateSummary() {
 func (this *NewDialysisApiController) CommitDialysisOrder() {
 
 	org_id := this.GetMobileAdminUserInfo().Org.Id
-	fmt.Println("org_id ===23232323232332", org_id)
+
+	//查询所有患者
+
+	list, err := service.GetAllPatientScheduleList(org_id)
+
+	for _, item := range list {
+		//查询所有患者的2022年12月31日以前的上机记录
+		orderList, _ := service.GetAllDialysiOrderList(item.ID, org_id)
+		for _, it := range orderList {
+			dialysOrder, _ := service.GetDialysisTotalCountThree(it.UserOrgId, it.PatientId, it.DialysisDate)
+			service.UpdateDialysisOrderSix(it.PatientId, it.DialysisDate, it.UserOrgId, dialysOrder.Count)
+		}
+	}
+
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list": list,
+		})
+		return
+	}
 
 }

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -259,6 +259,75 @@ func (this *StaffScheduleApiController) GetAllZone() {
 	})
 }
 
+func (this *StaffScheduleApiController) GetAllZonePb() {
+	orgid := this.GetMobileAdminUserInfo().Org.Id
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	start_time := this.GetString("start_time")
+	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()
+	}
+	zoneid, _ := this.GetInt64("zoneid")
+	classtype, _ := this.GetInt64("classtype")
+
+	// is_open, _ := this.GetInt64("is_open")
+
+	
+	//获取空床位的排班数据
+	list, _ := service.GetPatientScheduleByPd(startTime, zoneid, orgid, classtype)
+	if len(list) > 0 {
+		for _, item := range list {
+			for _, device := range item.DeviceNumber {
+				item.TotalBed += 1
+				for _, schedule := range device.Schedule {
+					if schedule.ScheduleType == 1 {
+						item.SwBed += 1
+					}
+					if schedule.ScheduleType == 2 {
+						item.XwBed += 1
+					}
+					if schedule.ScheduleType == 3 {
+						item.WsBed += 1
+					}
+				}
+			}
+		}
+	}
+
+	// stockType, _ := service.GetStockType(orgid)
+	// zonelist, _ := service.GetPatientScheduleListByZone(startTime, classtype, orgid)
+	// if err != nil {
+	// 	this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
+	// 	return
+	// }
+	this.ServeSuccessJSON(map[string]interface{}{
+		"schedule":  list,
+		// "stockType": stockType,
+		// "zonelist":  zonelist,
+	})
+	
+
+
+
+	// id := this.GetMobileAdminUserInfo().Org.Id
+	// zone, err := service.GetAllMobileZonePb(id)
+
+	// if err != nil {
+	// 	this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
+	// 	return
+	// }
+	// this.ServeSuccessJSON(map[string]interface{}{
+	// 	"zone": zone,
+	// })
+}
+
+
 func (this *StaffScheduleApiController) GetPatientScheduleList() {
 	orgid := this.GetMobileAdminUserInfo().Org.Id
 	fmt.Println("orgid", orgid)

controllers/new_mobile_api_controllers/staff_schedule_api_router.go

@@ -16,6 +16,7 @@ func StaffScheduleApiControllersRegisterRouters() {
 	beego.Router("/m/api/tosearchmobiletotal", &StaffScheduleApiController{}, "Get:ToSearchMobileTotal")
 	beego.Router("/m/api/changemobileoption", &StaffScheduleApiController{}, "Get:ChangeMobileOption")
 	beego.Router("/m/api/getallzone", &StaffScheduleApiController{}, "Get:GetAllZone")
+	beego.Router("/m/api/getallzonepb", &StaffScheduleApiController{}, "Get:GetAllZonePb")
 	beego.Router("/m/api/getpatientschedulelist", &StaffScheduleApiController{}, "Get:GetPatientScheduleList")
 	beego.Router("/m/api/deleteSchedule", &StaffScheduleApiController{}, "Get:DeleteSchedule")
 	beego.Router("/m/api/ssearchpatient", &StaffScheduleApiController{}, "Get:SearchPatient")

controllers/patient_api_controller.go

@@ -4526,10 +4526,7 @@ func (c *PatientApiController) GetRemindPatientList() {
 	limit, _ := c.GetInt64("limit", 10)
 	adminUserInfo := c.GetAdminUserInfo()
 	total, patients, _ := service.GetAllWaitRemindPatient(adminUserInfo.CurrentOrgId, page, limit)
-	fmt.Println("机构ID2222222222222", c.GetAdminUserInfo().CurrentOrgId)
-
 	_, errcode := service.GetOrgFollowIsExist(c.GetAdminUserInfo().CurrentOrgId)
-	fmt.Println("机构ID2222222222222", errcode)
 	if errcode == gorm.ErrRecordNotFound {
 		information, err := service.GetAdminUserRoleInformation(0)
 		if err != nil {

controllers/schedule_api_controller.go

@@ -63,6 +63,7 @@ func ScheduleApiRegistRouters() {
 
 	beego.Router("/api/schedule/weekpanelone", &ScheduleApiController{}, "Get:GetWeekPanelsOne")
 	beego.Router("/api/schedule/schedulesone", &ScheduleApiController{}, "Get:GetScheduleOne")
+	beego.Router("/api/schedule/scheduletwo", &ScheduleApiController{}, "Get:GetScheduleTwo")
 	beego.Router("/api/schedule/postscheduletemplate", &ScheduleApiController{}, "Get:SaveScheduleTemplate")
 	beego.Router("/api/schedule/getscheduletemplate", &ScheduleApiController{}, "Get:GetScheduleTemplate")
 	beego.Router("/api/order/changefuncprint", &ScheduleApiController{}, "Get:ChangeFuncPrint")
@@ -4001,6 +4002,72 @@ func (c *ScheduleApiController) GetScheduleOne() {
 	return
 }
 
+func (c *ScheduleApiController) GetScheduleTwo() {
+
+	week, _ := c.GetInt64("weekTime", 0) //1:last, 2:this 3:next 4 nextTwo
+	patitionIdStr := c.GetString("patitionid")
+
+	ids := strings.Split(patitionIdStr, ",")
+
+	schedule_type, _ := c.GetInt64("schedule_type")
+
+	adminInfo := c.GetAdminUserInfo()
+	weekDateStr := c.GetString("week_date")
+	WeekDayIds := strings.Split(weekDateStr, ",")
+
+	thisTime := time.Now()
+	today := thisTime.Format("2006-01-02")
+	if week < 1 || week > 4 {
+		week = 2
+	}
+	if week == 1 {
+		thisTime = thisTime.AddDate(0, 0, -7)
+	} else if week == 3 {
+		thisTime = thisTime.AddDate(0, 0, 7)
+	} else if week == 4 {
+		thisTime = thisTime.AddDate(0, 0, 14)
+	}
+
+	weekDay := int(thisTime.Weekday())
+	if weekDay == 0 {
+		weekDay = 7
+	}
+	weekEnd := 7 - weekDay
+	weekStart := weekEnd - 6
+	weekTitle := make([]string, 0)
+	days := make([]string, 0)
+	for index := weekStart; index <= weekEnd; index++ {
+		theDay := thisTime.AddDate(0, 0, index)
+		indexYear, indexMonthTime, indexDay := theDay.Date()
+		indexMonth := int(indexMonthTime)
+		indexWeek := strconv.Itoa(indexYear) + "." + strconv.Itoa(indexMonth) + "." + strconv.Itoa(indexDay)
+		weekTitle = append(weekTitle, indexWeek)
+		days = append(days, theDay.Format("2006-01-02"))
+	}
+
+	weekStartDay := thisTime.AddDate(0, 0, weekStart)
+	weekEndDay := thisTime.AddDate(0, 0, weekEnd)
+	weekStartTime := weekStartDay.Format("2006-01-02") + " 00:00:00"
+	weekEndTime := weekEndDay.Format("2006-01-02") + " 23:59:59"
+
+	timeLayout := "2006-01-02 15:04:05"
+	loc, _ := time.LoadLocation("Local")
+	theStarTime, _ := time.ParseInLocation(timeLayout, weekStartTime, loc)
+	theEndTime, _ := time.ParseInLocation(timeLayout, weekEndTime, loc)
+	weekStartPoint := theStarTime.Unix()
+	weekEndPoint := theEndTime.Unix()
+
+	schdules, _ := service.GetWeekScheduleThree(adminInfo.CurrentOrgId, weekStartPoint, weekEndPoint, ids, schedule_type, WeekDayIds)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"days":      days,
+		"weekTitle": weekTitle,
+		"schdules":  schdules,
+		"today":     today,
+	})
+	return
+}
+
 func (c *ScheduleApiController) SaveScheduleTemplate() {
 
 	template_id, _ := c.GetInt64("template_id")
@@ -4050,7 +4117,6 @@ func (c *ScheduleApiController) ChangeFuncPrint() {
 	}
 
 	_, errcode := service.GetDataPrintByOrgId(orgId)
-	fmt.Println("errcode222234444555556t66", errcode)
 	if errcode == gorm.ErrRecordNotFound {
 		service.CreateDataPrint(&dataPrint)
 		c.ServeSuccessJSON(map[string]interface{}{

controllers/self_drug_api_congtroller.go

@@ -3410,7 +3410,6 @@ func (this *SelfDrugApiController) GetDrugNewQuery() {
 	for _, it := range drug {
 		var sum_count int64
 		var limit_count int64
-		fmt.Println("it233323323232323223", it.DrugName)
 		drugInfo, _ := service.GetDrugWarehouseInfoName(it.ID, orgId)
 		for _, item := range drugInfo {
 

controllers/stock_in_api_controller.go

@@ -154,6 +154,9 @@ func StockManagerApiRegistRouters() {
 	beego.Router("/api/settle/stock", &StockManagerApiController{}, "Get:HandleSettleStock")
 	beego.Router("/api/settle/cancelstock", &StockManagerApiController{}, "Get:HandleRefundStock")
 
+	beego.Router("/api/stock/getnewgoodwarehouseinfo", &StockManagerApiController{}, "Get:GetNewGoodWarehouseInfo")
+	beego.Router("/api/stock/getnewwarehouseoutinfolist", &StockManagerApiController{}, "Get:GetNewWarehouseOutInfoList")
+
 }
 func (c *StockManagerApiController) HandleRefundStock() {
 	order_id, _ := c.GetInt64("order_id", 0)
@@ -663,6 +666,7 @@ func (c *StockManagerApiController) EditWarehouse() {
 				manufacturer := int64(items["manufacturer"].(float64))
 				dealer := int64(items["dealer"].(float64))
 				license_number, _ := items["license_number"].(string)
+				register_number, _ := items["register_number"].(string)
 				if items["id"] == nil || reflect.TypeOf(items["id"]).String() != "float64" {
 					utils.ErrorLog("id")
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -694,6 +698,7 @@ func (c *StockManagerApiController) EditWarehouse() {
 						PackingPrice:     packing_price,
 						StorehouseId:     storehouse_id,
 						IsCheck:          2,
+						RegisterNumber:   register_number,
 					}
 					warehousingInfo = append(warehousingInfo, warehouseInfo)
 
@@ -721,6 +726,7 @@ func (c *StockManagerApiController) EditWarehouse() {
 						LicenseNumber:    license_number,
 						PackingPrice:     packing_price,
 						StorehouseId:     storehouse_id,
+						RegisterNumber:   register_number,
 					}
 					upDateWarehousingInfo = append(upDateWarehousingInfo, warehouseInfo)
 
@@ -745,6 +751,7 @@ func (c *StockManagerApiController) EditWarehouse() {
 						ConsumableType:      1,
 						WarehousingDetailId: warehouseInfo.ID,
 						StorehouseId:        storehouse_id,
+						RegisterNumber:      register_number,
 					}
 
 					stockFlow = append(stockFlow, flow)
@@ -7801,3 +7808,113 @@ func (this *StockManagerApiController) GetInvetoryWarehouseInfoList() {
 		"dealerList":       dealerList,
 	})
 }
+
+func (this *StockManagerApiController) GetNewGoodWarehouseInfo() {
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	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()
+
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	storehouse_id, _ := this.GetInt64("storehouse_id")
+
+	keywords := this.GetString("keywords")
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	var goodids []int64
+	//查询商品名称
+	if len(keywords) > 0 {
+		//查询商品名称
+		list, _ := service.GetGoodInforByGoodName(keywords, orgId)
+		for _, item := range list {
+			goodids = append(goodids, item.ID)
+			//入库详情但里面查询
+		}
+	}
+
+	list, _ := service.GetNewGoodWarehouseInfo(startTime, endTime, orgId, goodids, storehouse_id)
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+	dealerList, _ := service.GetAllDealerList(orgId)
+	storeHouseList, _ := service.GetAllStoreHouseList(orgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":             list,
+		"manufacturerList": manufacturerList,
+		"dealerList":       dealerList,
+		"storeHouseList":   storeHouseList,
+	})
+}
+
+func (this *StockManagerApiController) GetNewWarehouseOutInfoList() {
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	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()
+
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	storehouse_id, _ := this.GetInt64("storehouse_id")
+
+	keywords := this.GetString("keyword")
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	var goodids []int64
+	//查询商品名称
+	if len(keywords) > 0 {
+		//查询商品名称
+		list, _ := service.GetGoodInforByGoodName(keywords, orgId)
+		for _, item := range list {
+			goodids = append(goodids, item.ID)
+			//入库详情但里面查询
+		}
+	}
+
+	list, _ := service.GetNewWarehouseOutInfoList(startTime, endTime, orgId, goodids, storehouse_id)
+
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+	dealerList, _ := service.GetAllDealerList(orgId)
+	storeHouseList, _ := service.GetAllStoreHouseList(orgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":             list,
+		"manufacturerList": manufacturerList,
+		"dealerList":       dealerList,
+		"storeHouseList":   storeHouseList,
+	})
+}

models/stock_models.go

@@ -279,26 +279,27 @@ func (WarehouseOutInfo) TableName() string {
 }
 
 type WarehouseOutInfoNight struct {
-	ID                      int64   `gorm:"column:id" json:"id"`
-	Count                   int64   `gorm:"column:count" json:"count"`
-	GoodId                  int64   `gorm:"column:good_id" json:"good_id"`
-	SysRecordTime           int64   `gorm:"column:sys_record_time" json:"sys_record_time"`
-	PatientId               int64   `gorm:"column:patient_id" json:"patient_id"`
-	ProjectId               int64   `gorm:"column:project_id" json:"project_id" form:"project_id"`
-	WarehouseInfotId        int64   `gorm:"column:warehouse_info_id" json:"warehouse_info_id"`
-	IsSys                   int64   `gorm:"column:is_sys" json:"is_sys"`
-	Status                  int64   `gorm:"column:status" json:"status"`
-	OrgId                   int64   `gorm:"column:org_id" json:"org_id"`
-	WarehouseOutOrderNumber string  `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
-	StorehouseId            int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
-	Price                   float64 `gorm:"column:price" json:"price" form:"price"`
-	Dealer                  int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Manufacturer            int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	GoodTypeId              int64   `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
-	ProductDate             int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
-	ExpiryDate              int64   `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
-	Number                  string  `gorm:"column:number" json:"number" form:"number"`
-	LicenseNumber           string  `gorm:"column:license_number" json:"license_number" form:"license_number"`
+	ID                      int64                 `gorm:"column:id" json:"id"`
+	Count                   int64                 `gorm:"column:count" json:"count"`
+	GoodId                  int64                 `gorm:"column:good_id" json:"good_id"`
+	SysRecordTime           int64                 `gorm:"column:sys_record_time" json:"sys_record_time"`
+	PatientId               int64                 `gorm:"column:patient_id" json:"patient_id"`
+	ProjectId               int64                 `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	WarehouseInfotId        int64                 `gorm:"column:warehouse_info_id" json:"warehouse_info_id"`
+	IsSys                   int64                 `gorm:"column:is_sys" json:"is_sys"`
+	Status                  int64                 `gorm:"column:status" json:"status"`
+	OrgId                   int64                 `gorm:"column:org_id" json:"org_id"`
+	WarehouseOutOrderNumber string                `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
+	StorehouseId            int64                 `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	Price                   float64               `gorm:"column:price" json:"price" form:"price"`
+	Dealer                  int64                 `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer            int64                 `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	GoodTypeId              int64                 `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
+	ProductDate             int64                 `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate              int64                 `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	Number                  string                `gorm:"column:number" json:"number" form:"number"`
+	LicenseNumber           string                `gorm:"column:license_number" json:"license_number" form:"license_number"`
+	GoodInfo                GoodInformationThirty `gorm:"ForeignKey:ID;AssociationForeignKey:GoodId" `
 }
 
 func (WarehouseOutInfoNight) TableName() string {
@@ -1574,37 +1575,38 @@ func (StartDrugWarehouseInfo) TableName() string {
 }
 
 type GoodWarehousingInfo struct {
-	ID                        int64   `gorm:"column:id" json:"id"`
-	WarehousingId             int64   `gorm:"column:warehousing_id" json:"warehousing_id"`
-	GoodId                    int64   `gorm:"column:good_id" json:"good_id"`
-	GoodTypeId                int64   `gorm:"column:good_type_id" json:"good_type_id"`
-	Number                    string  `gorm:"column:number" json:"number"`
-	ProductDate               int64   `gorm:"column:product_date" json:"product_date"`
-	ExpiryDate                int64   `gorm:"column:expiry_date" json:"expiry_date"`
-	WarehousingCount          int64   `gorm:"column:warehousing_count" json:"warehousing_count"`
-	WarehousingUnit           string  `gorm:"column:warehousing_unit" json:"warehousing_unit"`
-	Price                     float64 `gorm:"column:price" json:"price"`
-	TotalPrice                float64 `gorm:"column:total_price" json:"total_price"`
-	Dealer                    int64   `gorm:"column:dealer" json:"dealer"`
-	Manufacturer              int64   `gorm:"column:manufacturer" json:"manufacturer"`
-	Remark                    string  `gorm:"column:remark" json:"remark"`
-	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"`
-	IsReturn                  int64   `gorm:"column:is_return" json:"is_return"`
-	StockCount                int64   `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
-	WarehousingOrder          string  `gorm:"column:warehousing_order" json:"warehousing_order"`
-	Type                      int64   `gorm:"column:type" json:"type"`
-	LicenseNumber             string  `gorm:"column:license_number" json:"license_number" form:"license_number"`
-	WarehouseInfoId           int64   `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
-	PackingPrice              float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
-	SupplyWarehouseId         int64   `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
-	SupplyWarehouseDetailInfo int64   `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
-	StorehouseId              int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
-	SecondWarehouseInfoId     int64   `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
-	IsCheck                   int64   `gorm:"column:is_check" json:"is_check" form:"is_check"`
-	RegisterNumber            string  `gorm:"column:register_number" json:"register_number" form:"register_number"`
+	ID                        int64                 `gorm:"column:id" json:"id"`
+	WarehousingId             int64                 `gorm:"column:warehousing_id" json:"warehousing_id"`
+	GoodId                    int64                 `gorm:"column:good_id" json:"good_id"`
+	GoodTypeId                int64                 `gorm:"column:good_type_id" json:"good_type_id"`
+	Number                    string                `gorm:"column:number" json:"number"`
+	ProductDate               int64                 `gorm:"column:product_date" json:"product_date"`
+	ExpiryDate                int64                 `gorm:"column:expiry_date" json:"expiry_date"`
+	WarehousingCount          int64                 `gorm:"column:warehousing_count" json:"warehousing_count"`
+	WarehousingUnit           string                `gorm:"column:warehousing_unit" json:"warehousing_unit"`
+	Price                     float64               `gorm:"column:price" json:"price"`
+	TotalPrice                float64               `gorm:"column:total_price" json:"total_price"`
+	Dealer                    int64                 `gorm:"column:dealer" json:"dealer"`
+	Manufacturer              int64                 `gorm:"column:manufacturer" json:"manufacturer"`
+	Remark                    string                `gorm:"column:remark" json:"remark"`
+	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"`
+	IsReturn                  int64                 `gorm:"column:is_return" json:"is_return"`
+	StockCount                int64                 `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	WarehousingOrder          string                `gorm:"column:warehousing_order" json:"warehousing_order"`
+	Type                      int64                 `gorm:"column:type" json:"type"`
+	LicenseNumber             string                `gorm:"column:license_number" json:"license_number" form:"license_number"`
+	WarehouseInfoId           int64                 `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	PackingPrice              float64               `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	SupplyWarehouseId         int64                 `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
+	SupplyWarehouseDetailInfo int64                 `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
+	StorehouseId              int64                 `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	SecondWarehouseInfoId     int64                 `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
+	IsCheck                   int64                 `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	RegisterNumber            string                `gorm:"column:register_number" json:"register_number" form:"register_number"`
+	GoodInfo                  GoodInformationThirty `gorm:"ForeignKey:ID;AssociationForeignKey:GoodId" `
 }
 
 func (GoodWarehousingInfo) TableName() string {

service/doctor_schedule_service.go

@@ -588,6 +588,42 @@ func GetAllMobileZone(orgid int64) (zone []*models.DeviceZone, err error) {
 	return zone, err
 }
 
+func GetAllMobileZonePb(orgid int64) (zone []*models.DeviceZonePb, err error) {
+
+	err = XTReadDB().Model(&zone).Preload("DeviceNumber", "status =1").Where("org_id = ? and status = 1", orgid).Find(&zone).Error
+	return zone, err
+}
+
+func GetPatientScheduleByPd(schedule_date int64, zoneid int64, orgid int64, class_type int64) (list []*models.DeviceZonePb, err error) {
+
+	db := XTReadDB().Table("xt_device_zone as x").Where("x.status = 1")
+	if zoneid > 0 {
+		db = db.Where("x.id = ?", zoneid)
+	}
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	if class_type > 0 {
+		err = db.Select("x.id,x.org_id,x.name,x.type,x.sort").Preload("DeviceNumber", func(db *gorm.DB) *gorm.DB {
+			return XTReadDB().Model(&models.DeviceNumber{}).Where("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).Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
+					return db.Where("user_org_id = ? and status = 1", orgid).Group("patient_id,mode_id").Order("created_time asc")
+				})
+			})
+		}).Find(&list).Error
+	} else {
+		err = db.Select("x.id,x.org_id,x.name,x.type,x.sort").Preload("DeviceNumber", func(db *gorm.DB) *gorm.DB {
+			return XTReadDB().Model(&models.DeviceNumber{}).Where("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).Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
+					return db.Where("user_org_id = ? and status = 1", orgid).Group("patient_id,mode_id").Order("created_time asc")
+				})
+			})
+		}).Find(&list).Error
+	}
+
+	return list, err
+}
+
 func GetPatientSchedule(startime int64, zoneid int64, classtype int64, orgid int64) (schedule []*models.ScheduleTwenty, err error) {
 
 	db := XTReadDB().Table("xt_schedule as s")

service/manage_center_service.go

@@ -461,9 +461,15 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 			var sum_count int64  //该批次总库存
 			var over_count int64 //剩余数量
 
-			over_count = druginfo.StockMaxNumber*drug.MinNumber + druginfo.StockMinNumber
+			if druginfo.MaxUnit != druginfo.MinUnit {
+				over_count = druginfo.StockMaxNumber*drug.MinNumber + druginfo.StockMinNumber
+			}
+			if druginfo.MaxUnit == druginfo.MinUnit {
+				over_count = druginfo.StockMaxNumber + druginfo.StockMinNumber
+			}
+
 			if infos.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
-				out_count = info.Count * drug.MinNumber
+				out_count = infos.Count * drug.MinNumber
 
 			}
 			if infos.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
@@ -491,7 +497,7 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 			fmt.Println("g该批次总库存wowowoowow", sum_count)
 			if (over_count + out_count) <= sum_count {
 				if its.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
-
+					fmt.Print("itscoutn233232223999wi", its.Count)
 					//退库
 					warehouseInfo := models.DrugWarehouseInfo{
 						StockMinNumber: its.Count,
@@ -505,7 +511,7 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 
 				}
 				if its.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
-
+					fmt.Print("itscoutn999888", its.Count)
 					warehouseInfo := models.DrugWarehouseInfo{
 						StockMaxNumber: its.Count,
 					}
@@ -518,7 +524,7 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 				}
 
 				if its.CountUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
-
+					fmt.Print("itscoutnwohhhhwhw", its.Count)
 					warehouseInfo := models.DrugWarehouseInfo{
 						StockMaxNumber: its.Count,
 					}
@@ -906,7 +912,6 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 
 func GoodAutoAddCancelInfo(good *models.NewDialysisBeforePrepareGoods, creater int64) error {
 
-	fmt.Print("order_id223233232323223323223wo", good.OrderId)
 	//查询已经出库数量
 	info, _ := GetWareOutInfo(good.GoodId, good.RecordDate, good.UserOrgId, good.PatientId, good.OrderId)
 	if len(info) > 0 {

service/new_warehouse_service.go

@@ -1848,6 +1848,9 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 			AddDrugCount(advice.DrugId, orgID, storeConfig.DrugStorehouseOut, drugflow.Count)
 		}
 
+		fmt.Println("libai", out_count)
+		fmt.Println("cancel", cancel_count)
+		fmt.Println("deliver_number", deliver_number)
 		if deliver_number < (out_count - cancel_count) {
 			operation_time := time.Now().Unix()
 
@@ -2002,7 +2005,7 @@ func GetSigleDrugWarehouseOutInfoOne(patient_id int64, advice_date int64, orgid
 
 func UpdateSingleDrugWarehouseOutInfoSix(patient_id int64, advice_date int64, orgid int64, info *models.DrugWarehouseOutInfo, advice_id int64) error {
 
-	err := XTWriteDB().Model(&models.XtDrugWarehouseOutInfo{}).Where("patient_id = ? and sys_record_time = ? and org_id = ? and advice_id = ?", patient_id, advice_date, orgid, advice_id).Update(map[string]interface{}{"count": info.Count, "price": info.Price, "total_price": info.TotalPrice, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "remark": info.Remark, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "retail_price": info.RetailPrice, "number": info.Number, "batch_number": info.BatchNumber, "count_unit": info.CountUnit, "warehouse_info_id": info.WarehouseInfoId, "storehouse_id": info.StorehouseId}).Error
+	err := XTWriteDB().Model(&models.XtDrugWarehouseOutInfo{}).Where("patient_id = ? and sys_record_time = ? and org_id = ? and advice_id = ? and status= 1", patient_id, advice_date, orgid, advice_id).Update(map[string]interface{}{"count": info.Count, "price": info.Price, "total_price": info.TotalPrice, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "remark": info.Remark, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "retail_price": info.RetailPrice, "number": info.Number, "batch_number": info.BatchNumber, "count_unit": info.CountUnit, "warehouse_info_id": info.WarehouseInfoId, "storehouse_id": info.StorehouseId}).Error
 	return err
 }
 
@@ -2083,7 +2086,7 @@ func FindDrugCancelStock(return_date int64, org_id int64) (*models.DrugCancelSto
 
 	stock := models.DrugCancelStock{}
 	var err error
-	err = XTReadDB().Where("return_date = ? and org_id = ? and status = 1", return_date, org_id).Find(&stock).Error
+	err = XTReadDB().Where("return_time = ? and org_id = ? and status = 1", return_date, org_id).Find(&stock).Error
 	if err == gorm.ErrRecordNotFound {
 		return nil, err
 	}
@@ -2096,7 +2099,7 @@ func FindDrugCancelStock(return_date int64, org_id int64) (*models.DrugCancelSto
 func FindLastDrugCancelStock(advice_date int64, org_id int64) (models.DrugCancelStock, error) {
 
 	cancelStock := models.DrugCancelStock{}
-	err := XTReadDB().Where("return_date = ? and org_id = ? and status = 1", advice_date, org_id).Find(&cancelStock).Error
+	err := XTReadDB().Where("return_time = ? and org_id = ? and status = 1", advice_date, org_id).Find(&cancelStock).Error
 	return cancelStock, err
 }
 
@@ -2127,15 +2130,19 @@ func UpdateHisPrescriptionProjectStatus(project_id int64, record_time int64, use
 }
 
 // 药品自动出库 递归方式
-func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.HisDoctorAdviceInfo) (err error) {
+func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.HisDoctorAdviceInfo, prescribingCount float64) (err error) {
 
 	// 判断处方里药品单位是拆零单位还是包装单位,	如果是包装单位，则根据规格，将包装数量转为拆零数量
 	var deliver_number int64 = 0
+	var deliver_number_one int64 = 0
 	var stock_number int64 = 0
 
 	prescribingNumber_temp := strconv.FormatFloat(math.Abs(prescribingNumber), 'f', 0, 64)
 	count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
 
+	prescribingCount_temp := strconv.FormatFloat(math.Abs(prescribingCount), 'f', 0, 64)
+	prescribe_count, _ := strconv.ParseInt(prescribingCount_temp, 10, 64)
+
 	var drug_price float64
 	if advice.PrescribingNumberUnit == drup.MaxUnit {
 		deliver_number = count * drup.MinNumber
@@ -2145,6 +2152,14 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 
 	}
 
+	if advice.PrescribingNumberUnit == drup.MaxUnit {
+		deliver_number_one = prescribe_count * drup.MinNumber
+
+	} else {
+		deliver_number_one = prescribe_count
+
+	}
+
 	if advice.PrescribingNumberUnit == drup.MaxUnit {
 		drug_price = drup.RetailPrice
 	}
@@ -2162,7 +2177,8 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 	// 如果没有对应的库存，则报错
 	storeConfig, _ := GetAllStoreHouseConfig(advice.UserOrgId)
 	lastWarehouse, _ := FindLastDrugWarehousingInfoByID(advice.DrugId, storeConfig.DrugStorehouseOut)
-	if lastWarehouse.StockMinNumber >= drup.MinNumber {
+
+	if lastWarehouse.StockMinNumber >= drup.MinNumber && lastWarehouse.MaxUnit != lastWarehouse.MinUnit {
 		var stockMax int64
 		var stockMin int64
 		stockMax = lastWarehouse.StockMinNumber / drup.MinNumber
@@ -2174,7 +2190,6 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 	warehouse, err := FindLastDrugWarehousingInfoByID(advice.DrugId, storeConfig.DrugStorehouseOut)
 
 	if err != nil {
-
 		return err
 	}
 	// 将该批次的剩余库存数量转换为拆零数量
@@ -2196,8 +2211,8 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 	}
 
 	// 当库存数量大于或等于出库数量的话，则正常出库该批次
-	fmt.Println("stock_nbumber3223323232", stock_number)
-	fmt.Println("deliver_number", deliver_number)
+	fmt.Println("剩余库存2332233223232323", stock_number)
+	fmt.Println("出库数量233232332323232", deliver_number)
 	if stock_number >= deliver_number {
 
 		var maxNumber int64 = 0
@@ -2235,41 +2250,83 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 
 		warehouse.Mtime = time.Now().Unix()
 
-		fmt.Println("minnU目标而332322323323233223323223我", minNumber)
-		fmt.Println("max_number232232332232322wo", maxNumber)
-		fmt.Println(" warehouse.StockMinNumber", warehouse.StockMinNumber)
+		//fmt.Println("minnU目标而332322323323233223323223我", minNumber)
+		//fmt.Println("max_number232232332232322wo", maxNumber)
+		//fmt.Println(" warehouse.StockMinNumber", warehouse.StockMinNumber)
 
-		if warehouse.StockMinNumber < minNumber {
+		if warehouse.MaxUnit != warehouse.MinUnit {
+			if warehouse.StockMinNumber < minNumber {
 
-			warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
-			if warehouse.MaxUnit != warehouse.MinUnit {
-				warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
-			}
-		} else {
-			if minNumber > 0 {
-				if (warehouse.StockMinNumber - minNumber) >= 0 {
-					warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
+				warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
+				if warehouse.MaxUnit != warehouse.MinUnit {
+					warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
 				}
+			} else {
+				if minNumber > 0 {
+					if (warehouse.StockMinNumber - minNumber) >= 0 {
+						warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
+					}
 
-			}
+				}
 
-			if minNumber == 0 && maxNumber != 1 && warehouse.StockMaxNumber <= 0 {
-				if warehouse.StockMinNumber > 0 {
-					if warehouse.StockMinNumber-deliver_number >= 0 {
+				if minNumber == 0 && maxNumber != 1 && warehouse.StockMaxNumber <= 0 {
+					if warehouse.StockMinNumber > 0 {
+						if warehouse.StockMinNumber-deliver_number >= 0 {
+							warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+						}
+
+					}
+
+				}
+
+				if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit {
+					if (warehouse.StockMinNumber - deliver_number) >= 0 {
 						warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
 					}
 
 				}
 
 			}
-
 		}
 
-		if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit {
-			if (warehouse.StockMinNumber - deliver_number) >= 0 {
-				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+		if warehouse.MinUnit == warehouse.MaxUnit {
+			//fmt.Println("minNUMBER233223233223322323",minNumber)
+			//fmt.Println("warehouse.StockMinNumber",warehouse.StockMinNumber)
+			//fmt.Println("warehouse.StockMaxNumber",warehouse.StockMaxNumber)
+			if warehouse.StockMaxNumber > 0 && warehouse.StockMinNumber == 0 && warehouse.StockMaxNumber >= minNumber {
+				warehouse.StockMaxNumber = warehouse.StockMaxNumber - minNumber
+
 			}
 
+			if warehouse.StockMaxNumber == 0 && warehouse.StockMinNumber > 0 && warehouse.StockMinNumber >= minNumber {
+				warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
+			}
+
+			if warehouse.StockMaxNumber > 0 && warehouse.StockMinNumber > 0 && (warehouse.StockMaxNumber+warehouse.StockMinNumber) > minNumber {
+
+				var out_false int64 = 0
+				if warehouse.StockMinNumber >= minNumber {
+					warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
+					out_false = 1
+				}
+				fmt.Println("out_false233223233223wo", out_false)
+				if warehouse.StockMinNumber < minNumber && out_false == 0 {
+
+					var over_total int64
+					over_total = warehouse.StockMinNumber
+					warehouse.StockMinNumber = 0
+					warehouse.StockMaxNumber = warehouse.StockMaxNumber - (minNumber - over_total)
+				}
+			}
+
+			//if warehouse.StockMaxNumber < minNumber && warehouse.StockMaxNumber < minNumber && (warehouse.StockMaxNumber + warehouse.StockMinNumber) > minNumber {
+			//  var over_count int64
+			//  over_count = warehouse.StockMinNumber
+			//  warehouse.StockMinNumber = 0
+			//  warehouse.StockMaxNumber = warehouse.StockMaxNumber - (minNumber -over_count)
+			//
+			//}
+
 		}
 
 		if drup.MaxUnit != drup.MinUnit {
@@ -2330,7 +2387,7 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 
 		//查询今日该药品该患者是否有出库数据
 		lastDrugOutInfo, _ := GetNewDrugWarehouseOutInfoSix(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID, warehouse.ID)
-
+		fmt.Println("lastDrugOutInfo0000000293293292392392393293239239", lastDrugOutInfo)
 		if lastDrugOutInfo.ID == 0 {
 			errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
 			if errOne != nil {
@@ -2345,7 +2402,10 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 			if lastDrugOutInfo.CountUnit == drup.MinUnit {
 				his_count = lastDrugOutInfo.Count
 			}
+			fmt.Println("deliver_numberwode8888888823832832832832832832823823-------------------------", deliver_number)
+			fmt.Println("his_countnide-------------------------------------------------------", his_count)
 			if deliver_number != his_count {
+				//warehouseOutInfo.Count = deliver_number_one
 				errThree := UpdateSigleDrugWarehouseOutInfo(lastDrugOutInfo.ID, warehouseOutInfo)
 				if errThree != nil {
 					return errThree
@@ -2367,11 +2427,11 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 			cancel_count += item.Count
 		}
 
-		fmt.Println("deliver_number", deliver_number)
+		fmt.Println("deliver_number_one", deliver_number)
 		fmt.Println("out_count", out_count)
 		fmt.Println("cancel_count", cancel_count)
 		//如果本次出库数据大于历史出库数据 新增1条流水
-		if deliver_number > (out_count - cancel_count) {
+		if deliver_number_one > (out_count - cancel_count) {
 			drugflow := models.DrugFlow{
 				WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
 				WarehouseOutId:          warehouseout.ID,
@@ -2379,7 +2439,7 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 				Number:                  warehouse.Number,
 				ProductDate:             warehouse.ProductDate,
 				ExpireDate:              warehouse.ExpiryDate,
-				Count:                   deliver_number - (out_count - cancel_count), //按最小单位计算,
+				Count:                   deliver_number_one - (out_count - cancel_count), //按最小单位计算,
 				Price:                   warehouse.RetailPrice,
 				Status:                  1,
 				Ctime:                   time.Now().Unix(),
@@ -2450,7 +2510,7 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 		}
 
 		//如果本次出库数据小于历史出库数据 新增1条退库流水
-		if deliver_number < (out_count - cancel_count) {
+		if deliver_number_one < (out_count - cancel_count) {
 
 			operation_time := time.Now().Unix()
 
@@ -2484,9 +2544,9 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 
 			manufactureName, _ := GetManufactureById(warehouse.Manufacturer)
 			dealer, _ := GetDealerById(warehouse.Dealer)
-			cancelInfo, _ := GetLastDrugCancelStockById(advice.UserOrgId)
+			//cancelInfo, _ := GetLastDrugCancelStockById(advice.UserOrgId)
 			cancelStockInfo := models.DrugCancelStockInfo{
-				OrderNumber:      cancelInfo.OrderNumber,
+				OrderNumber:      lastDrugCancelStock.OrderNumber,
 				CancelStockId:    lastDrugCancelStock.ID,
 				DrugId:           advice.DrugId,
 				Count:            (out_count - cancel_count) - deliver_number,
@@ -2658,17 +2718,21 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 			OrderId:                 warehouseout.OrderId,
 		}
 		//查询是否存在出库数据
-		_, errCode := GetSigleDrugWarehouseOutInfo(advice.PatientId, advice.AdviceDate, orgID)
-		if errCode == gorm.ErrRecordNotFound {
+
+		lastDrugOutInfoTwo, _ := GetNewDrugWarehouseOutInfoSix(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID, warehouse.ID)
+		//_, errCode := GetSigleDrugWarehouseOutInfo(advice.PatientId, advice.AdviceDate, orgID)
+		//fmt.Println("errcoedee232233223233232323232323233223232323322323232323232323",errCode)
+		if lastDrugOutInfoTwo.ID == 0 {
 
 			errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
 			if errOne != nil {
 				return errOne
 			}
 		}
-		if errCode == nil {
+		if lastDrugOutInfoTwo.ID > 0 {
 
 			lastDrugOutInfo, _ := GetSigleDrugWarehouseOutInfoOne(advice.PatientId, advice.AdviceDate, orgID)
+			fmt.Println("中国人民肌肤32323223332332232322323喔", lastDrugOutInfo)
 			var his_count int64
 			if lastDrugOutInfo.CountUnit == drup.MaxUnit {
 				his_count = lastDrugOutInfo.Count * drup.MinNumber
@@ -2676,7 +2740,10 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 			if lastDrugOutInfo.CountUnit == drup.MinUnit {
 				his_count = lastDrugOutInfo.Count
 			}
+			fmt.Println("deliver_number3232323232wowooww", deliver_number)
+			fmt.Println("his_count99999992i2222wo", his_count)
 			if deliver_number != his_count {
+
 				errThree := UpdateSingleDrugWarehouseOutInfoSix(advice.PatientId, advice.AdviceDate, orgID, warehouseOutInfo, advice.ID)
 				if errThree != nil {
 					return errThree
@@ -2727,6 +2794,9 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 			cancel_count += item.Count
 		}
 
+		fmt.Println("出库数量", deliver_number)
+		fmt.Println("out_coutn233232322323wo", cancel_count)
+		fmt.Println("out_count99988233232", out_count)
 		//如果本次出库数据大于历史出库数据 新增1条流水
 		if deliver_number > (out_count - cancel_count) {
 
@@ -2768,6 +2838,7 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 		}
 
 		if deliver_number < (out_count - cancel_count) {
+			fmt.Println("即那里3232232323")
 			operation_time := time.Now().Unix()
 
 			ctime := time.Now().Unix()
@@ -2880,8 +2951,9 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 
 		advice.PrescribingNumber = float64(prescribingNumber_two_temp)
 		advice.PrescribingNumberUnit = drup.MinUnit
+		fmt.Println("剩余库存9999999233232", overPlusNumber)
 
-		HisSettleDrugDeliverInfo(orgID, overPlusNumber, warehouseout, drup, advice)
+		HisSettleDrugDeliverInfo(orgID, overPlusNumber, warehouseout, drup, advice, prescribingCount)
 	}
 
 	return

service/patient_service.go

@@ -66,9 +66,17 @@ func GetPatientList(orgID int64, keywords string, page, limit, schedulType, bind
 	}
 
 	offset := (page - 1) * limit
+	if lapseto == 2 || lapseto == 3 {
+		err = db.Order("p.death_time desc").Select(" p.id, p.user_org_id, p.user_id, p.patient_type, p.dialysis_no, p.admission_number, p.source, p.lapseto, p.partition_id, p.bed_id, p.name, p.alias, p.gender, p.marital_status, p.id_card_no, p.birthday, p.reimbursement_way_id, p.health_care_type, p.health_care_no, p.health_care_due_date, p.height, p.blood_type, p.rh, p.health_care_due_alert_date, p.education_level, p.profession, p.phone, p.home_telephone, p.relative_phone, p.relative_relations, p.home_address, p.work_unit, p.unit_address, p.children, p.receiving_date, p.is_hospital_first_dialysis, p.first_dialysis_date, p.first_dialysis_hospital, p.induction_period, p.initial_dialysis, p.total_dialysis, p.attending_doctor_id, p.head_nurse_id, p.evaluate, p.diagnose, p.remark, p.registrars_id, p.registrars, p.qr_code, p.binding_state, p.status, p.created_time, p.updated_time,p.user_sys_before_count,p.out_reason,p.death_time,p.is_infectious").Group("p.id").Count(&total).Offset(offset).Limit(limit).Find(&patients).Error
+
+	}
+	if lapseto != 2 && lapseto != 3 {
+		err = db.Order("p.id desc").Select(" p.id, p.user_org_id, p.user_id, p.patient_type, p.dialysis_no, p.admission_number, p.source, p.lapseto, p.partition_id, p.bed_id, p.name, p.alias, p.gender, p.marital_status, p.id_card_no, p.birthday, p.reimbursement_way_id, p.health_care_type, p.health_care_no, p.health_care_due_date, p.height, p.blood_type, p.rh, p.health_care_due_alert_date, p.education_level, p.profession, p.phone, p.home_telephone, p.relative_phone, p.relative_relations, p.home_address, p.work_unit, p.unit_address, p.children, p.receiving_date, p.is_hospital_first_dialysis, p.first_dialysis_date, p.first_dialysis_hospital, p.induction_period, p.initial_dialysis, p.total_dialysis, p.attending_doctor_id, p.head_nurse_id, p.evaluate, p.diagnose, p.remark, p.registrars_id, p.registrars, p.qr_code, p.binding_state, p.status, p.created_time, p.updated_time,p.user_sys_before_count,p.out_reason,p.death_time,p.is_infectious").Group("p.id").Count(&total).Offset(offset).Limit(limit).Find(&patients).Error
+
+	}
 
-	err = db.Order("p.id desc").Select(" p.id, p.user_org_id, p.user_id, p.patient_type, p.dialysis_no, p.admission_number, p.source, p.lapseto, p.partition_id, p.bed_id, p.name, p.alias, p.gender, p.marital_status, p.id_card_no, p.birthday, p.reimbursement_way_id, p.health_care_type, p.health_care_no, p.health_care_due_date, p.height, p.blood_type, p.rh, p.health_care_due_alert_date, p.education_level, p.profession, p.phone, p.home_telephone, p.relative_phone, p.relative_relations, p.home_address, p.work_unit, p.unit_address, p.children, p.receiving_date, p.is_hospital_first_dialysis, p.first_dialysis_date, p.first_dialysis_hospital, p.induction_period, p.initial_dialysis, p.total_dialysis, p.attending_doctor_id, p.head_nurse_id, p.evaluate, p.diagnose, p.remark, p.registrars_id, p.registrars, p.qr_code, p.binding_state, p.status, p.created_time, p.updated_time,p.user_sys_before_count,p.out_reason,p.death_time,p.is_infectious").Group("p.id").Count(&total).Offset(offset).Limit(limit).Find(&patients).Error
 	return
+
 }
 
 //GetAllPatientList 返回全部患者的列表

service/patientmanage_service.go

@@ -1879,3 +1879,36 @@ func DeleteHospitalSummary(id []string) error {
 	err := XTWriteDB().Model(models.XtHospitalSummary{}).Where("id in (?) and status=1", id).Updates(map[string]interface{}{"status": 0}).Error
 	return err
 }
+
+func GetAllPatientScheduleList(org_id int64) (patient []*models.PatientsThirty, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and status = 1", org_id).Find(&patient).Error
+
+	return patient, err
+}
+
+func GetAllDialysiOrderList(patient_id int64, org_id int64) (order []*models.DialysisOrder, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and user_org_id = ? and status= 1 and dialysis_date<=1672416000", patient_id, org_id).Find(&order).Error
+
+	return order, err
+}
+
+func GetDialysisTotalCountThree(org_id int64, patient_id int64, dialysis_date int64) (models.BloodDialysisOrderCount, error) {
+
+	order := models.BloodDialysisOrderCount{}
+	db := XTReadDB().Table("xt_dialysis_order as o")
+
+	err = db.Raw("select count(o.id) as count,o.patient_id from xt_dialysis_order as o left join xt_schedule as x on x.patient_id = o.patient_id where o.status =1 and o.user_org_id = ? and o.patient_id = ? and o.dialysis_date<=? and  x.schedule_date = o.dialysis_date and x.status = 1 ", org_id, patient_id, dialysis_date).Scan(&order).Error
+
+	return order, err
+}
+
+func UpdateDialysisOrderSix(patient_id int64, dialysis_date int64, user_org_id int64, dialysis_total int64) (models.DialysisOrder, error) {
+
+	order := models.DialysisOrder{}
+
+	err := XTWriteDB().Model(&order).Where("patient_id = ? and dialysis_date = ? and user_org_id = ? and status = 1", patient_id, dialysis_date, user_org_id).Updates(map[string]interface{}{"dialysis_total": dialysis_total}).Error
+
+	return order, err
+}

service/schedule_service.go

@@ -114,7 +114,6 @@ func GetWeekScheduleOne(orgID int64, start, end int64, partionid int64, schedule
 func GetWeekScheduleTwo(orgID int64, start, end int64, schIds []string, scheduletype int64) (schedules []*models.Schedule, err error) {
 
 	db := readDb.Table("xt_schedule as s")
-	fmt.Println("schIds2222222")
 	if len(schIds) > 0 {
 		db = db.Where("s.partition_id in (?)", schIds)
 	}
@@ -130,6 +129,28 @@ func GetWeekScheduleTwo(orgID int64, start, end int64, schIds []string, schedule
 	return
 }
 
+func GetWeekScheduleThree(orgID int64, start, end int64, schIds []string, scheduletype int64, WeekDayIds []string) (schedules []*models.Schedule, err error) {
+
+	db := readDb.Table("xt_schedule as s")
+
+	if len(schIds) > 0 {
+		db = db.Where("s.partition_id in (?)", schIds)
+	}
+	if scheduletype > 0 {
+		db = db.Where("s.schedule_type = ?", scheduletype)
+	}
+	if len(WeekDayIds) > 0 {
+		db = db.Where("s.schedule_week in(?)", WeekDayIds)
+	}
+	err = db.Preload("PatientInfectiousDiseases", "status = 1 ").
+		Joins("JOIN xt_patients as p ON p.id = s.patient_id").
+		Where("s.user_org_id=? and s.schedule_date>=? and s.schedule_date<=? and s.status=1", orgID, start, end).
+		Select("s.id, s.user_org_id, s.partition_id, s.bed_id, s.patient_id, s.schedule_date, s.schedule_type, s.schedule_week, s.mode_id, s.status, s.created_time, s.updated_time,s.dialysis_machine_name, p.name as patient").
+		Order("updated_time asc").
+		Find(&schedules).Error
+	return
+}
+
 func GetDaySchedule(orgID, start, end, patientID int64) (schedule models.Schedule, err error) {
 	err = readDb.Model(&models.Schedule{}).Where("user_org_id=? and patient_id=? and schedule_date>=? and schedule_date<=? and status=1", orgID, patientID, start, end).First(&schedule).Error
 	return

service/stock_service.go

@@ -8380,3 +8380,50 @@ func GetWarehouseOutInfoIsExistSix(good_id int64, patient_id int64, record_time
 	}
 	return &info, nil
 }
+
+func GetNewGoodWarehouseInfo(startime int64, endtime int64, orgid int64, good_id []int64, storehouse_id int64) (info []*models.GoodWarehousingInfo, err error) {
+
+	db := XTReadDB().Model(&info).Where("status = 1")
+
+	if startime > 0 {
+		db = db.Where("ctime>=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("ctime<=?", endtime)
+	}
+	if orgid > 0 {
+		db = db.Where("org_id = ?", orgid)
+	}
+	if len(good_id) > 0 {
+		db = db.Where("good_id in(?)", good_id)
+	}
+	if storehouse_id > 0 {
+		db = db.Where("storehouse_id = ?", storehouse_id)
+	}
+	err = db.Preload("GoodInfo", "org_id = ? and status= 1", orgid).Find(&info).Error
+	return info, err
+}
+
+func GetNewWarehouseOutInfoList(start_time int64, end_time int64, orgid int64, good_id []int64, storehouse_id int64) (info []*models.WarehouseOutInfoNight, err error) {
+
+	db := XTReadDB().Model(&info).Where("status= 1")
+
+	if start_time > 0 {
+		db = db.Where("ctime>=?", start_time)
+	}
+	if end_time > 0 {
+		db = db.Where("ctime <=?", end_time)
+	}
+
+	if orgid > 0 {
+		db = db.Where("org_id = ?", orgid)
+	}
+	if len(good_id) > 0 {
+		db = db.Where("good_id in(?)", good_id)
+	}
+	if storehouse_id > 0 {
+		db = db.Where("storehouse_id = ?", storehouse_id)
+	}
+	err = db.Preload("GoodInfo", "org_id = ? and status = 1", orgid).Find(&info).Error
+	return info, err
+}

service/warhouse_service.go

@@ -12219,7 +12219,7 @@ func HisSettleDrugsDelivery(orgID int64, creater int64, advice *models.HisDoctor
 		if drup.ID > 0 {
 			prescribingNumber := advice.PrescribingNumber
 
-			HisSettleDrugDeliverInfo(orgID, prescribingNumber, &out, &drup, advice)
+			HisSettleDrugDeliverInfo(orgID, prescribingNumber, &out, &drup, advice, prescribingNumber)
 
 		} else {
 			return errors.New("药品信息不存在")