11月8日库存管理

controllers/gobal_config_api_controller.go

@@ -116,6 +116,8 @@ func GobalConfigRegistRouters() {
 	beego.Router("/api/changestocksetting/isopen", &GobalConfigApiController{}, "Get:ChangeStockSetting")
 
 	beego.Router("/api/changeadviceconfig", &GobalConfigApiController{}, "Get:ChangeAdviceConfig")
+
+	beego.Router("/api/changeprescriptionconfig", &GobalConfigApiController{}, "Get:ChangePrescriptionConfig")
 }
 
 //provinces, _ := service.GetDistrictsByUpid(0)21
@@ -1563,11 +1565,14 @@ func (c *GobalConfigApiController) GetAllIsOpenConfig() {
 
 	stockSetting, _ := service.FindStockSettingById(adminUserInfo.CurrentOrgId)
 	adviceSetting, _ := service.FindAdviceSettingById(adminUserInfo.CurrentOrgId)
+
+	prescriptionConfig, _ := service.FindPrescriptionConfigById(adminUserInfo.CurrentOrgId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"is_open_xt_his":         config.IsOpen,
 		"is_open_xt_his_project": project_config.IsOpen,
 		"is_open_stock":          stockSetting.IsType,
 		"is_open_advice":         adviceSetting.IsAdviceOpen,
+		"is_prescription_advice": prescriptionConfig.IsOpen,
 	})
 
 }
@@ -2395,3 +2400,38 @@ func (c *GobalConfigApiController) ChangeAdviceConfig() {
 	}
 
 }
+
+func (c *GobalConfigApiController) ChangePrescriptionConfig() {
+
+	is_open_prescription_xt_his, _ := c.GetInt64("is_open_prescription_xt_his")
+
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+
+	_, errcode := service.GetPrescriptionConfig(orgId)
+
+	if errcode == gorm.ErrRecordNotFound {
+
+		config := models.XtPrescriptionConfig{
+			UserOrgId: orgId,
+			IsOpen:    is_open_prescription_xt_his,
+			Status:    1,
+			Ctime:     time.Now().Unix(),
+		}
+		service.CreatePrescriptionConfig(config)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": 1,
+		})
+	} else if errcode == nil {
+		config := models.XtPrescriptionConfig{
+			UserOrgId: orgId,
+			IsOpen:    is_open_prescription_xt_his,
+			Status:    1,
+			Ctime:     time.Now().Unix(),
+		}
+		service.UpdatePrescriptionConfig(orgId, config)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": 1,
+		})
+	}
+
+}

controllers/his_summary_controller.go

@@ -3,6 +3,7 @@ package controllers
 import (
 	"XT_New/enums"
 	"XT_New/service"
+	"fmt"
 	"github.com/astaxie/beego"
 	"github.com/shopspring/decimal"
 	"time"
@@ -47,6 +48,7 @@ func (this *HisSummaryApiController) GetHisSummaryDetailList() {
 
 	his_patient, _ := service.GetHisSummaryPatientInfo(adminUser.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime)
 
+	order, _ := service.GetHisLastOrder(adminUser.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime)
 	//获取所有的科室
 	hisDepatment, _ := service.GetHisDepatment(adminUser.CurrentOrgId)
 	if err == nil {
@@ -55,6 +57,7 @@ func (this *HisSummaryApiController) GetHisSummaryDetailList() {
 			"patient":      patient,
 			"his_patient":  his_patient,
 			"hisDepatment": hisDepatment,
+			"order":        order,
 		})
 		return
 	} else {
@@ -113,6 +116,10 @@ func (this *HisSummaryApiController) GetGatherDetaiList() {
 	//获取所有客户
 	adminInfo, _ := service.GetAllDoctorSix(org_id, appid)
 
+	//获取最后一次排班
+	schedule, _ := service.GetHisSchedule(patient_id, org_id, startRecordDateTime, endRecordDateTime)
+	fmt.Println("scheudlwe3223333232233232232323232323232323", schedule)
+	bedNumber, _ := service.GetAllBedNumberSix(org_id)
 	var bedCostTotal float64 = 0 //床位总费
 
 	var operationCostTotal float64 = 0 //手术费
@@ -297,6 +304,9 @@ func (this *HisSummaryApiController) GetGatherDetaiList() {
 			"treatCostTotal":                      treatCostTotal,
 			"his_patient":                         his_patient,
 			"hisDepatment":                        hisDepatment,
+			"prescription":                        prescription,
+			"schedule":                            schedule,
+			"bedNumber":                           bedNumber,
 		})
 	} else {
 		for _, item := range order_info {
@@ -514,6 +524,8 @@ func (this *HisSummaryApiController) GetGatherDetaiList() {
 			"prescription":                        prescription,
 			"balanceAccountsType":                 BalanceAccountsType,
 			"medicalInsuranceLevelList":           medicalInsuranceLevelList,
+			"schedule":                            schedule,
+			"bedNumber":                           bedNumber,
 		})
 
 	}

models/device_models.go

@@ -1120,3 +1120,18 @@ func (PatientDialysisOrder) TableName() string {
 
 	return "xt_dialysis_order"
 }
+
+type ScheduleDeviceNumber struct {
+	ID      int64  `gorm:"column:id" json:"id" form:"id"`
+	OrgId   int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Number  string `gorm:"column:number" json:"number" form:"number"`
+	GroupId int64  `gorm:"column:group_id" json:"group_id" form:"group_id"`
+	ZoneId  int64  `gorm:"column:zone_id" json:"zone_id" form:"zone_id"`
+	Status  int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime   int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime   int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+func (ScheduleDeviceNumber) TableName() string {
+	return "xt_device_number"
+}

models/his_charge_models.go

@@ -10,6 +10,7 @@ type HisChargePrescriptionProject struct {
 	Count             string            `gorm:"column:count" json:"count" form:"count"`
 	Type              int64             `gorm:"column:type" json:"type" form:"type"`
 	Unit              string            `gorm:"column:unit" json:"unit" form:"unit"`
+	Remark            string            `gorm:"column:remark" json:"remark" form:"remark"`
 	HisChargeProject  HisChargeProject  `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"project"`
 	HisChargeGoodInfo HisChargeGoodInfo `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"good_info"`
 }
@@ -26,6 +27,7 @@ type HisChargeDoctorAdviceInfo struct {
 	PrescribingNumberUnit string `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
 	Status                int64  `gorm:"column:status" json:"status" form:"status"`
 	DrugId                int64  `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Remark                string `gorm:"column:remark" json:"remark" form:"remark"`
 	Drug                  Drug   `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" json:"drug"`
 }
 

models/stock_models.go

@@ -1358,3 +1358,16 @@ type XtAdviceSetting struct {
 func (XtAdviceSetting) TableName() string {
 	return "xt_advice_setting"
 }
+
+type XtPrescriptionConfig struct {
+	ID        int64 `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	IsOpen    int64 `gorm:"column:is_open" json:"is_open" form:"is_open"`
+	Status    int64 `gorm:"column:status" json:"status" form:"status"`
+	Ctime     int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime     int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+func (XtPrescriptionConfig) TableName() string {
+	return "xt_prescription_config"
+}

service/device_service.go

@@ -761,3 +761,9 @@ func GetPatientIdOne(patient_id int64, orgId int64) (models.XtPatientsNew, error
 
 	}
 }
+
+func GetAllBedNumberSix(orgId int64) (devicenumber []*models.ScheduleDeviceNumber, err error) {
+
+	err = XTReadDB().Where("org_id = ? and status = 1", orgId).Find(&devicenumber).Error
+	return devicenumber, err
+}

service/his_summary_service.go

@@ -8,147 +8,21 @@ import (
 
 func GetHisSummaryDetailList(keyword string, item_type int64, patient_id int64, org_id int64, start_time int64, end_time int64) (patients []*models.ChargePatient, err error) {
 
-	if len(keyword) == 0 {
-		switch item_type {
-		case 0:
-			err = XTReadDB().Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2 and orders.patient_id = ?", start_time, end_time, org_id, patient_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
-					Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
-						return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").
-							Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
-								return db.Preload("Drug", "status = 1").Where("status = 1")
-							}).Preload("HisChargePrescriptionProject", func(db *gorm.DB) *gorm.DB {
-							return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type,unit").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
-								return db.Select("id,project_name,unit").Where("status = 1 ")
-							}).Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
-								return db.Select("id,good_name,good_unit,specification_name,packing_unit").Where("status = 1 ")
-							}).Where("status = 1 ")
-						})
-					}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
-			}).Where("p.status = 1  AND p.user_org_id = ? and p.id = ?", org_id, patient_id).Group("id").Find(&patients).Error
-
-			break
-		case 1:
-			err = XTReadDB().Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2 and orders.patient_id = ?", start_time, end_time, org_id, patient_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
-					Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
-						return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Where("advice_id > 0 AND project_id = 0").Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
-							return db.Preload("Drug", "status = 1").Where("status = 1")
-						}).Preload("HisChargePrescriptionProject", func(db *gorm.DB) *gorm.DB {
-							return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
-								return db.Select("id,project_name,unit").Where("status = 1 ")
-							}).Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
-								return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
-							}).Where("status = 1 ")
-						})
-					}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
-			}).Where("p.status = 1  AND p.user_org_id = ? and p.id = ?", org_id, patient_id).Group("id").Find(&patients).Error
-
-			break
-		case 2:
-			err = XTReadDB().Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2 and order.patient_id = ?", start_time, end_time, org_id, patient_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
-					Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
-						return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Where("advice_id = 0 AND project_id > 0").Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
-							return db.Preload("Drug", "status = 1").Where("status = 1")
-						}).Preload("HisChargePrescriptionProject", func(db *gorm.DB) *gorm.DB {
-							return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
-								return db.Select("id,project_name,unit").Where("status = 1 ")
-							}).Where("status = 1 ")
-						})
-					}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
-			}).Where("p.status = 1  AND p.user_org_id = ? and p.id = ?", org_id, patient_id).Group("id").Find(&patients).Error
-
-			break
-		case 3:
-			err = XTReadDB().Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2 and orders.patient_id = ?", start_time, end_time, org_id, patient_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
-					Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
-						return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Where("advice_id = 0 AND project_id > 0").Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
-							return db.Preload("Drug", "status = 1").Where("status = 1")
-						}).Preload("HisChargePrescriptionProject", func(db *gorm.DB) *gorm.DB {
-							return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type").Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
-								return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
-							}).Where("status = 1 ")
-						})
-					}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
-			}).Where("p.status = 1  AND p.user_org_id = ? and p.id =?", org_id, patient_id).Group("id").Find(&patients).Error
-
-			break
-
-		}
-
-	} else {
-		//	keyword := "%" + keyword + "%"
-		switch item_type {
-		case 0:
-			err = XTReadDB().Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
-					Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
-						return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
-							return db.Preload("Drug", "status = 1").Where("status = 1")
-						}).Preload("HisChargePrescriptionProject", func(db *gorm.DB) *gorm.DB {
-							return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
-								return db.Select("id,project_name,unit").Where("status = 1 ")
-							}).Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
-								return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
-							}).Where("status = 1 ")
-						})
-					}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
-			}).Where("p.status = 1  AND p.user_org_id = ? and p.id = ?", org_id, patient_id).Group("id").Find(&patients).Error
-			break
-
-		case 1:
-			err = XTReadDB().Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2 and ", start_time, end_time, org_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
-					Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
-						return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Where("advice_id > 0 AND project_id = 0").Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
-							return db.Preload("Drug", "status = 1").Where("status = 1")
-						}).Preload("HisChargePrescriptionProject", func(db *gorm.DB) *gorm.DB {
-							return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
-								return db.Select("id,project_name,unit").Where("status = 1 ")
-							}).Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
-								return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
-							}).Where("status = 1 ")
-						})
-					}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
-			}).Where("p.status = 1  AND p.user_org_id = ? and p.id = ?", org_id, patient_id).Group("id").Find(&patients).Error
-
-			break
-		case 2:
-			err = XTReadDB().Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
-					Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
-						return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Where("advice_id = 0 AND project_id > 0").Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
-							return db.Preload("Drug", "status = 1").Where("status = 1")
-						}).Preload("HisChargePrescriptionProject", func(db *gorm.DB) *gorm.DB {
-							return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
-								return db.Select("id,project_name,unit").Where("status = 1 ")
-							}).Where("status = 1 ")
-						})
-					}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
-			}).Where("p.status = 1  AND p.user_org_id = ? and p.id = ?", org_id, patient_id).Group("id").Find(&patients).Error
-
-			break
-		case 3:
-			err = XTReadDB().Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
-					Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
-						return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Where("advice_id = 0 AND project_id > 0").Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
-							return db.Preload("Drug", "status = 1").Where("status = 1")
-						}).Preload("HisChargePrescriptionProject", func(db *gorm.DB) *gorm.DB {
-							return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type").Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
-								return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
-							}).Where("status = 1 ")
-						})
-					}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
-			}).Where("p.status = 1  AND p.user_org_id = ? and p.id = ?", org_id, patient_id).Group("id").Find(&patients).Error
-
-			break
-
-		}
-
-	}
+	err = XTReadDB().Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2 and orders.patient_id = ?", start_time, end_time, org_id, patient_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
+		return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
+			Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
+				return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").
+					Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+						return db.Preload("Drug", "status = 1").Where("status = 1")
+					}).Preload("HisChargePrescriptionProject", func(db *gorm.DB) *gorm.DB {
+					return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type,unit,remark").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
+						return db.Select("id,project_name,unit").Where("status = 1 ")
+					}).Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
+						return db.Select("id,good_name,good_unit,specification_name,packing_unit").Where("status = 1 ")
+					}).Where("status = 1 ")
+				})
+			}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
+	}).Where("p.status = 1  AND p.user_org_id = ? and p.id = ?", org_id, patient_id).Group("id").Find(&patients).Error
 
 	return
 
@@ -413,3 +287,17 @@ func GetHisPrescriptionTenty(org_id int64, patient_id int64, start_time int64, e
 
 	return
 }
+
+func GetHisLastOrder(org_id int64, patient_id int64, start_time int64, end_time int64) (models.HisOrder, error) {
+
+	order := models.HisOrder{}
+
+	err := XTReadDB().Where("user_org_id = ? and patient_id = ? and ctime>=? and ctime<=? and fa_piao_number<> ''", org_id, patient_id, start_time, end_time).Last(&order).Error
+	return order, err
+}
+
+func GetHisSchedule(patient_id int64, org_id int64, start_time int64, end_time int64) (schedule []*models.XtSchedule, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and user_org_id = ? and schedule_date >=? and schedule_date<=? and status = 1", patient_id, org_id, start_time, end_time).Find(&schedule).Error
+	return schedule, err
+}

service/stock_service.go

@@ -6538,3 +6538,35 @@ func FindAdviceSettingById(orgid int64) (models.XtAdviceSetting, error) {
 	err := XTReadDB().Where("user_org_id = ? and status = 1", orgid).Find(&setting).Error
 	return setting, err
 }
+
+func GetPrescriptionConfig(orgid int64) (*models.XtPrescriptionConfig, error) {
+
+	config := models.XtPrescriptionConfig{}
+	err := XTReadDB().Where("user_org_id = ? and status = 1", orgid).Find(&config).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &config, nil
+}
+
+func CreatePrescriptionConfig(prescriptionConfig models.XtPrescriptionConfig) error {
+
+	err := XTWriteDB().Create(&prescriptionConfig).Error
+	return err
+}
+
+func UpdatePrescriptionConfig(orgid int64, config models.XtPrescriptionConfig) error {
+
+	err := XTWriteDB().Model(&config).Where("user_org_id = ? and status = 1", orgid).Update(map[string]interface{}{"is_open": config.IsOpen, "mtime": time.Now().Unix()}).Error
+	return err
+}
+
+func FindPrescriptionConfigById(orgid int64) (models.XtPrescriptionConfig, error) {
+	config := models.XtPrescriptionConfig{}
+	err := XTReadDB().Where("user_org_id = ? and status = 1", orgid).Find(&config).Error
+
+	return config, err
+}