耗材参数

controllers/doctors_api_controller.go

@@ -9,6 +9,7 @@ import (
 	"github.com/astaxie/beego"
 	"github.com/jinzhu/gorm"
 	"strconv"
+	"strings"
 	"time"
 )
 
@@ -43,7 +44,8 @@ func DoctorApiRegistRouters() {
 	//阶段小结路由
 	beego.Router("/api/patient/getinspectionmajoritem", &DoctorsApiController{}, "Get:GetInspectionMajorItem")
 	beego.Router("/api/patient/getinspectiondetail", &DoctorsApiController{}, "Get:GetInspectionDetailByProject")
-
+	beego.Router("/api/patient/getinspectionitemlist", &DoctorsApiController{}, "Get:GetInspectionItemlist")
+	beego.Router("/api/patient/getinitdatelist", &DoctorsApiController{}, "Get:GetInitDateList")
 }
 
 func (c *DoctorsApiController) ScheduleAdvices() {
@@ -700,3 +702,33 @@ func (this *DoctorsApiController) GetInspectionDetailByProject() {
 		return
 	}
 }
+
+func (this *DoctorsApiController) GetInspectionItemlist() {
+	patient_id, _ := this.GetInt64("patient_id")
+	ids := this.GetString("ids")
+	inspect_date := this.GetString("inspect_date")
+	idSplit := strings.Split(ids, ",")
+	indateSplit := strings.Split(inspect_date, ",")
+	list, err := service.GetInspectionItemlist(patient_id, indateSplit, idSplit)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list": list,
+		})
+		return
+	}
+}
+
+func (this *DoctorsApiController) GetInitDateList() {
+	patient_id, _ := this.GetInt64("patient_id")
+
+	prescription_list, _ := service.GetDialysisPrescriptionDataList(patient_id)
+	befor_list, err := service.GetDialysisBeforInitDateList(patient_id)
+
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"beforlist":         befor_list,
+			"prescription_list": prescription_list,
+		})
+		return
+	}
+}

controllers/drug_stock_api_contorller.go

@@ -68,6 +68,8 @@ func DrugStockManagerApiRegistRouters() {
 
 	beego.Router("/api/drug/getcanceldrugorderprint", &StockDrugApiController{}, "get:GetCancelDrugOrderPrint")
 	beego.Router("/api/drug/drugcancelexportlist", &StockDrugApiController{}, "get:GetDrugCancelExportList")
+	beego.Router("/api/drug/getdrugwarehouseinfoprint", &StockDrugApiController{}, "get:GetDrugWarehouseInfoPrint")
+	beego.Router("/api/drug/getdrugoutorderprint", &StockDrugApiController{}, "get:GetDrugOutOrderPrint")
 }
 
 func (c *StockDrugApiController) CreateDrugWarehouse() {
@@ -2945,3 +2947,87 @@ func (this *StockDrugApiController) GetDrugCancelExportList() {
 		"list": list,
 	})
 }
+
+func (c *StockDrugApiController) GetDrugWarehouseInfoPrint() {
+
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+	order_type, _ := c.GetInt64("order_type")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			fmt.Println(err)
+			c.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())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	adminUserInfo := c.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	if order_type == 1 {
+		list, err := service.GetDrugWarehouseInfoPrint(startTime, endTime, orgId)
+		if err == nil {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"list": list,
+			})
+			return
+		}
+	}
+}
+
+func (c *StockDrugApiController) GetDrugOutOrderPrint() {
+
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+	order_type, _ := c.GetInt64("order_type")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			fmt.Println(err)
+			c.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())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	adminUserInfo := c.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	if order_type == 2 {
+		//list, err := service.GetDrugOutOrderPrint(startTime, endTime, orgId)
+		list, err := service.GetDrugOutOrderPrintList(startTime, endTime, orgId)
+		if err == nil {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"list": list,
+			})
+			return
+		}
+	}
+
+}

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -334,22 +334,12 @@ func (this *StaffScheduleApiController) UpdatePatientScheduleById() {
 		for index, _ := range list {
 			fmt.Println("index2322332", index)
 			schedule := models.XtSchedule{
-				PartitionId:  list[0].PartitionId,
-				BedId:        list[0].BedId,
-				PatientId:    list[0].PatientId,
-				ScheduleDate: list[0].ScheduleDate,
-				ScheduleType: list[0].ScheduleType,
-				ScheduleWeek: list[0].ScheduleWeek,
-				ModeId:       list[0].ModeId,
+				PatientId: list[0].PatientId,
+				ModeId:    list[0].ModeId,
 			}
 			xtSchedule := models.WeekSchedule{
-				PartitionId:  list[1].PartitionId,
-				BedId:        list[1].BedId,
-				PatientId:    list[1].PatientId,
-				ScheduleDate: list[1].ScheduleDate,
-				ScheduleType: list[1].ScheduleType,
-				ScheduleWeek: list[1].ScheduleWeek,
-				ModeId:       list[1].ModeId,
+				PatientId: list[1].PatientId,
+				ModeId:    list[1].ModeId,
 			}
 			err = service.UpdateStaffSchedule(list[1].ID, schedule)
 			fmt.Println("errrrrrrr2323323232323", err)

controllers/print_data_api_controller.go

@@ -204,4 +204,16 @@ func (this *PrintDataAPIController) GetGoodDetailPrintList() {
 		})
 	}
 
+	//出库详情
+	if types == 2 {
+		list, err := service.GetWarehouseOutInfoGoodDetailPrintList(adminUserInfo.CurrentOrgId, startTime, endTime, limit, page)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list": list,
+		})
+	}
+
 }

models/self_drug_models.go

@@ -68,6 +68,10 @@ type XtBaseDrug struct {
 	Total                  float64 `gorm:"column:total" json:"total" form:"total"`
 	PrescribingNumberUnit  string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_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"`
+	DrugDay                string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
+	MinPrice               float64 `gorm:"column:min_price" json:"min_price" form:"min_price"`
 }
 
 func (XtBaseDrug) TableName() string {
@@ -322,33 +326,34 @@ func (XtDrugWarehouseOut) TableName() string {
 }
 
 type XtDrugWarehouseOutInfo struct {
-	ID                      int64   `gorm:"column:id" json:"id" form:"id"`
-	WarehouseOutId          int64   `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
-	DrugId                  int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	WarehousingOutTarget    int64   `gorm:"column:warehousing_out_target" json:"warehousing_out_target" form:"warehousing_out_target"`
-	Count                   int64   `gorm:"column:count" json:"count" form:"count"`
-	Price                   float64 `gorm:"column:price" json:"price" form:"price"`
-	TotalPrice              float64 `gorm:"column:total_price" json:"total_price" form:"total_price"`
-	ProductDate             int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
-	ExpiryDate              int64   `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
-	Mtime                   int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Ctime                   int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Status                  int64   `gorm:"column:status" json:"status" form:"status"`
-	OrgId                   int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	Remark                  string  `gorm:"column:remark" json:"remark" form:"remark"`
-	IsCancel                int64   `gorm:"column:is_cancel" json:"is_cancel" form:"is_cancel"`
-	WarehouseOutOrderNumber string  `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
-	Type                    int64   `gorm:"column:type" json:"type" form:"type"`
-	Dealer                  int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Manufacturer            int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	IsSys                   int64   `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
-	SysRecordTime           int64   `gorm:"column:sys_record_time" json:"sys_record_time" form:"sys_record_time"`
-	RetailPrice             float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
-	RetailTotalPrice        float64 `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
-	CountUnit               string  `gorm:"column:count_unit" json:"count_unit" form:"count_unit"`
-	WarehouseInfoId         int64   `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
-	Number                  string  `gorm:"column:number" json:"number" form:"number"`
-	BatchNumber             string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	ID                      int64      `gorm:"column:id" json:"id" form:"id"`
+	WarehouseOutId          int64      `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
+	DrugId                  int64      `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	WarehousingOutTarget    int64      `gorm:"column:warehousing_out_target" json:"warehousing_out_target" form:"warehousing_out_target"`
+	Count                   int64      `gorm:"column:count" json:"count" form:"count"`
+	Price                   float64    `gorm:"column:price" json:"price" form:"price"`
+	TotalPrice              float64    `gorm:"column:total_price" json:"total_price" form:"total_price"`
+	ProductDate             int64      `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate              int64      `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	Mtime                   int64      `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Ctime                   int64      `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Status                  int64      `gorm:"column:status" json:"status" form:"status"`
+	OrgId                   int64      `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Remark                  string     `gorm:"column:remark" json:"remark" form:"remark"`
+	IsCancel                int64      `gorm:"column:is_cancel" json:"is_cancel" form:"is_cancel"`
+	WarehouseOutOrderNumber string     `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
+	Type                    int64      `gorm:"column:type" json:"type" form:"type"`
+	Dealer                  int64      `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer            int64      `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	IsSys                   int64      `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
+	SysRecordTime           int64      `gorm:"column:sys_record_time" json:"sys_record_time" form:"sys_record_time"`
+	RetailPrice             float64    `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	RetailTotalPrice        float64    `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
+	CountUnit               string     `gorm:"column:count_unit" json:"count_unit" form:"count_unit"`
+	WarehouseInfoId         int64      `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	Number                  string     `gorm:"column:number" json:"number" form:"number"`
+	BatchNumber             string     `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	XtBaseDrug              XtBaseDrug `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" `
 }
 
 func (XtDrugWarehouseOutInfo) TableName() string {
@@ -356,18 +361,19 @@ func (XtDrugWarehouseOutInfo) TableName() string {
 }
 
 type XtDrugAutomaticReduceDetail struct {
-	ID                      int64  `gorm:"column:id" json:"id" form:"id"`
-	WarehouseOutId          int64  `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
-	WarehouseOutOrderNumber string `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
-	PatientId               int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	Ctime                   int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime                   int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Status                  int64  `gorm:"column:status" json:"status" form:"status"`
-	RecordTime              int64  `gorm:"column:record_time" json:"record_time" form:"record_time"`
-	OrgId                   int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	DrugId                  int64  `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	Count                   int64  `gorm:"column:count" json:"count" form:"count"`
-	CountUnit               string `gorm:"column:count_unit" json:"count_unit" form:"count_unit"`
+	ID                      int64      `gorm:"column:id" json:"id" form:"id"`
+	WarehouseOutId          int64      `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
+	WarehouseOutOrderNumber string     `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
+	PatientId               int64      `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Ctime                   int64      `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                   int64      `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status                  int64      `gorm:"column:status" json:"status" form:"status"`
+	RecordTime              int64      `gorm:"column:record_time" json:"record_time" form:"record_time"`
+	OrgId                   int64      `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	DrugId                  int64      `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Count                   int64      `gorm:"column:count" json:"count" form:"count"`
+	CountUnit               string     `gorm:"column:count_unit" json:"count_unit" form:"count_unit"`
+	XtBaseDrug              XtBaseDrug `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" `
 }
 
 func (XtDrugAutomaticReduceDetail) TableName() string {
@@ -375,31 +381,32 @@ func (XtDrugAutomaticReduceDetail) TableName() string {
 }
 
 type XtDrugWarehouseInfo struct {
-	ID               int64   `gorm:"column:id" json:"id" form:"id"`
-	WarehousingId    int64   `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
-	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"`
-	WarehousingCount int64   `gorm:"column:warehousing_count" json:"warehousing_count" form:"warehousing_count"`
-	Price            float64 `gorm:"column:price" json:"price" form:"price"`
-	TotalPrice       float64 `gorm:"column:total_price" json:"total_price" form:"total_price"`
-	Dealer           int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Manufacturer     int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	Remark           string  `gorm:"column:remark" json:"remark" form:"remark"`
-	Ctime            int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime            int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Status           int64   `gorm:"column:status" json:"status" form:"status"`
-	OrgId            int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	IsReturn         int64   `gorm:"column:is_return" json:"is_return" form:"is_return"`
-	WarehousingOrder string  `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
-	Type             int64   `gorm:"column:type" json:"type" form:"type"`
-	RetailPrice      float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
-	RetailTotalPrice float64 `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
-	StockMaxNumber   int64   `gorm:"column:stock_max_number" json:"stock_max_number"`
-	StockMinNumber   int64   `gorm:"column:stock_min_number" json:"stock_min_number"`
-	BatchNumber      string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
-	MaxUnit          string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	ID               int64      `gorm:"column:id" json:"id" form:"id"`
+	WarehousingId    int64      `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
+	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"`
+	WarehousingCount int64      `gorm:"column:warehousing_count" json:"warehousing_count" form:"warehousing_count"`
+	Price            float64    `gorm:"column:price" json:"price" form:"price"`
+	TotalPrice       float64    `gorm:"column:total_price" json:"total_price" form:"total_price"`
+	Dealer           int64      `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer     int64      `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Remark           string     `gorm:"column:remark" json:"remark" form:"remark"`
+	Ctime            int64      `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime            int64      `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status           int64      `gorm:"column:status" json:"status" form:"status"`
+	OrgId            int64      `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	IsReturn         int64      `gorm:"column:is_return" json:"is_return" form:"is_return"`
+	WarehousingOrder string     `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	Type             int64      `gorm:"column:type" json:"type" form:"type"`
+	RetailPrice      float64    `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	RetailTotalPrice float64    `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
+	StockMaxNumber   int64      `gorm:"column:stock_max_number" json:"stock_max_number"`
+	StockMinNumber   int64      `gorm:"column:stock_min_number" json:"stock_min_number"`
+	BatchNumber      string     `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	MaxUnit          string     `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	XtBaseDrug       XtBaseDrug `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" `
 }
 
 func (XtDrugWarehouseInfo) TableName() string {

models/stock_models.go

@@ -368,6 +368,27 @@ func (AutomaticReduceDetail) TableName() string {
 	return "xt_automatic_reduce_detail"
 }
 
+type SgjAutomaticReduceDetail struct {
+	ID                      int64   `gorm:"column:id" json:"id"`
+	WarehouseOutId          int64   `gorm:"column:warehouse_out_id" json:"warehouse_out_id"`
+	WarehouseOutOrderNumber string  `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number"`
+	PatientId               int64   `gorm:"column:patient_id" json:"patient_id"`
+	Ctime                   int64   `gorm:"column:ctime" json:"ctime"`
+	Mtime                   int64   `gorm:"column:mtime" json:"mtime"`
+	Status                  int64   `gorm:"column:status" json:"status"`
+	RecordTime              int64   `gorm:"column:record_time" json:"record_time"`
+	OrgId                   int64   `gorm:"column:org_id" json:"org_id"`
+	GoodId                  int64   `gorm:"column:good_id" json:"good_id"`
+	GoodTypeId              int64   `gorm:"column:good_type_id" json:"good_type_id"`
+	Count                   int64   `gorm:"column:count" json:"count"`
+	Type                    int64   `gorm:"column:type" json:"type"`
+	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"`
+	RetailPrice             float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	PackingPrice            float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+}
+
 type VmWarehouseOutInfo struct {
 	GoodId int64   `gorm:"column:good_id" json:"good_id"`
 	Count  int64   `gorm:"column:count" json:"count"`

service/doctor_schedule_service.go

@@ -591,8 +591,9 @@ func GetPatientSchedule(startime int64, zoneid int64, classtype int64, orgid int
 	if classtype > 0 {
 		db = db.Where("s.schedule_type = ?", classtype)
 	}
-	err = db.Preload("DeviceZone", " status= 1").Preload("DeviceNumber", "status= 1").
-		Preload("DialysisOrder", "status =1").Joins("JOIN xt_patients as p ON p.id = s.patient_id and p.lapseto = 1 and p.user_org_id =?", orgid).Where("s.user_org_id = ? and s.schedule_date = ? and s.status =1", orgid, startime).
+	err = db.Preload("DeviceZone", " status= 1").Preload("DeviceNumber", func(db *gorm.DB) *gorm.DB {
+		return XTReadDB().Model(&models.DeviceNumber{}).Where("status = 1 AND org_id = ?", orgid).Order("sort asc")
+	}).Preload("DialysisOrder", "status =1").Joins("JOIN xt_patients as p ON p.id = s.patient_id and p.lapseto = 1 and p.user_org_id =?", orgid).Where("s.user_org_id = ? and s.schedule_date = ? and s.status =1", orgid, startime).
 		Select("s.id, s.user_org_id, s.partition_id, s.bed_id, s.patient_id, s.schedule_date, s.schedule_type, s.schedule_week, s.mode_id,p.name as patient").Find(&schedule).Error
 	return schedule, err
 }
@@ -625,12 +626,12 @@ func GetStaffScheduleById(ids []string) (schedule []*models.XtSchedule, err erro
 
 func UpdateStaffSchedule(nextid int64, schedule models.XtSchedule) error {
 
-	err := XTWriteDB().Model(&schedule).Where("id = ?", nextid).Updates(map[string]interface{}{"partition_id": schedule.PartitionId, "bed_id": schedule.BedId, "patient_id": schedule.PatientId, "schedule_type": schedule.ScheduleType, "schedule_week": schedule.ScheduleWeek, "mode_id": schedule.ModeId}).Error
+	err := XTWriteDB().Model(&schedule).Where("id = ?", nextid).Updates(map[string]interface{}{"patient_id": schedule.PatientId, "mode_id": schedule.ModeId}).Error
 	return err
 }
 
 func UpdateStaffScheduleOne(nextid int64, schedule models.WeekSchedule) error {
 
-	err := XTWriteDB().Model(&schedule).Where("id = ?", nextid).Updates(map[string]interface{}{"partition_id": schedule.PartitionId, "bed_id": schedule.BedId, "patient_id": schedule.PatientId, "schedule_type": schedule.ScheduleType, "schedule_week": schedule.ScheduleWeek, "mode_id": schedule.ModeId}).Error
+	err := XTWriteDB().Model(&schedule).Where("id = ?", nextid).Updates(map[string]interface{}{"patient_id": schedule.PatientId, "mode_id": schedule.ModeId}).Error
 	return err
 }

service/drug_stock_service.go

@@ -193,3 +193,70 @@ func GetDrugCancelExportList(orderid []string, orgid int64) (info []*models.Drug
 	err = db.Find(&info).Error
 	return info, err
 }
+
+func GetDrugWarehouseInfoPrint(startime int64, endtime int64, orgid int64) (info []*models.XtDrugWarehouseInfo, err error) {
+
+	db := XTReadDB().Table("xt_drug_warehouse_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)
+	}
+	err = db.Preload("XtBaseDrug", "status = 1 and org_id = ?", orgid).Group("drug_id").Find(&info).Error
+
+	//err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,sum(x.warehousing_count) as warehousing_count,x.price,x.total_price,x.dealer,x.manufacturer,x.remark,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,x.warehouseing_unit,x.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.batch_number").Group("x.drug_id").Find(&DrugWarehouseInfo{}).Error
+	return info, err
+}
+
+//func GetDrugWarehouseInfoList(startime int64,endtime int64,orgid int64)(info []*models.BloodAutomaticReduceDetail,err error)  {
+//
+//
+//  db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")
+//  if startime > 0 {
+//    db = db.Where("x.ctime >=?", startime)
+//  }
+//  if endtime>0{
+//    db = db.Where("x.ctime<=?", endtime)
+//  }
+//  if orgid > 0{
+//    db = db.Where("x.org_id = ?", orgid)
+//  }
+//
+//
+//}
+
+func GetDrugOutOrderPrint(startime int64, endtime int64, orgid int64) (info []*models.XtDrugWarehouseOutInfo, err error) {
+
+	db := XTReadDB().Table("xt_drug_warehouse_out_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)
+	}
+	err = db.Preload("XtBaseDrug", "status = 1 and org_id = ?", orgid).Group("drug_id").Find(&info).Error
+	return info, err
+}
+
+func GetDrugOutOrderPrintList(startime int64, endtime int64, orgid int64) (list []*models.XtDrugAutomaticReduceDetail, err error) {
+
+	db := XTReadDB().Table("xt_drug_automatic_reduce_detail").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)
+	}
+	err = db.Preload("XtBaseDrug", "status = 1 and org_id = ?", orgid).Find(&list).Error
+	return list, err
+}

service/patientmanage_service.go

@@ -1658,3 +1658,43 @@ func GetInspectionDetailByProject(project_id int64, patientid int64, inspect_dat
 	err = db.Select("x.id,x.patient_id,x.org_id,x.project_id,x.item_id,x.item_name,x.project_name,x.inspect_type,x.inspect_value,x.inspect_date,t.range_max,t.range_min,t.range_value,t.unit").Joins("left join xt_inspection_reference as t on t.id = x.item_id").Scan(&inspection).Error
 	return inspection, err
 }
+
+func GetInspectionItemlist(patientid int64, inspect_date []string, projectid []string) (inspection []*models.XtInspection, err error) {
+
+	db := XTReadDB().Model(&inspection).Where("status = 1")
+	if patientid > 0 {
+		db = db.Where("patient_id = ?", patientid)
+	}
+	if len(inspect_date) > 0 {
+		db = db.Where("inspect_date in(?)", inspect_date)
+	}
+
+	if len(projectid) > 0 {
+		db = db.Where("project_id in(?)", projectid)
+	}
+
+	err = db.Find(&inspection).Error
+	return inspection, err
+}
+
+func GetDialysisBeforInitDateList(patient_id int64) (models.DialysisAssesmentBefor, error) {
+	befor := models.DialysisAssesmentBefor{}
+	db := XTReadDB().Model(&befor).Where("status = 1")
+	if patient_id > 0 {
+		db = db.Where("patient_id = ? and assessment_date>=1627747200 and assessment_date<=1630339200 ", patient_id)
+	}
+
+	err = db.Last(&befor).Error
+	return befor, err
+}
+
+func GetDialysisPrescriptionDataList(patient_id int64) (models.DialysisPrescription, error) {
+
+	prescription := models.DialysisPrescription{}
+	db := XTReadDB().Model(&prescription).Where("status = 1")
+	if patient_id > 0 {
+		db = db.Where("patient_id = ? and record_date>=1627747200 and record_date<=1630339200", patient_id)
+	}
+	err = db.Last(&prescription).Error
+	return prescription, err
+}

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -216,7 +216,7 @@ func GetGoodInfomationList(orgid int64) (goodInfo []*models.GoodInfo, err error)
 }
 
 func GetWarehouseInfoGoodDetailPrintList(orgid int64, startime int64, endtime int64, limit int64, page int64) (info []*models.VmWarehousingInfo, err error) {
-	offset := (page - 1) * limit
+	//offset := (page - 1) * limit
 	db := p_service.XTReadDB().Table("xt_warehouse_info as x").Where("x.status = 1")
 	table := p_service.XTReadDB().Table("xt_good_information as t").Where("t.status = 1")
 	fmt.Println(table)
@@ -231,6 +231,25 @@ func GetWarehouseInfoGoodDetailPrintList(orgid int64, startime int64, endtime in
 		db = db.Where("x.ctime<=?", endtime)
 	}
 
-	err = db.Select("x.id,x.warehousing_id,x.good_id,x.good_type_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehousing_unit,x.stock_count,x.price,x.total_price,x.dealer,x.manufacturer,x.remark,x.is_return,x.warehousing_order,x.type,x.license_number,t.good_name,t.specification_name,t.min_number,t.packing_unit").Joins("left join xt_good_information as t on t.id = x.good_id").Offset(offset).Limit(limit).Scan(&info).Error
+	err = db.Select("x.id,x.warehousing_id,x.good_id,x.good_type_id,x.number,x.product_date,x.expiry_date,sum(x.warehousing_count) as warehousing_count,x.warehousing_unit,x.stock_count,x.price,x.total_price,x.dealer,x.manufacturer,x.remark,x.is_return,x.warehousing_order,x.type,x.license_number,t.good_name,t.specification_name,t.min_number,t.packing_unit").Joins("left join xt_good_information as t on t.id = x.good_id").Group("x.good_id").Scan(&info).Error
 	return info, err
 }
+
+func GetWarehouseOutInfoGoodDetailPrintList(orgid int64, startime int64, endtime int64, limit int64, page int64) (auto []*models.SgjAutomaticReduceDetail, err error) {
+
+	db := p_service.XTReadDB().Table("xt_automatic_reduce_detail as x").Where("x.status = 1")
+	table := p_service.XTReadDB().Table("xt_good_information as t").Where("t.status = 1")
+	fmt.Println(table)
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	if startime > 0 {
+		db = db.Where("x.ctime >= ?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.ctime<=?", endtime)
+	}
+	err = db.Select("x.patient_id,x.record_time,x.good_id,sum(x.count) as count,t.good_name,t.specification_name,t.packing_unit,t.retail_price,t.packing_price").Joins("left join xt_good_information as t on t.id = x.good_id").Group("x.good_id").Scan(&auto).Error
+	return auto, err
+
+}