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

controllers/his_api_controller.go

@@ -5351,17 +5351,17 @@ func (c *HisApiController) GetFaPiaoData() {
 	admin, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, adminUser.AdminUser.Id)
 
 	c.ServeSuccessJSON(map[string]interface{}{
-		"order_number":    order.Number,        //业务流水号
-		"id_card_no":      his.IdCardNo,        //社会保障号
-		"department_name": department.Name,     //科室
-		"number":          his.Number,          //门诊号
-		"date":            order.SettleEndTime, //结算日期
-		"name":            order.PsnName,       //姓名
-		"gender":          order.Gend,          //性别
-		"psn_cash_money":  order.PsnCashPay,    //个人支付
-		"pay_way":         "门诊",                //结算方式
-		"medfee_sumamt":   order.MedfeeSumamt,  //总费用
-		"admin_user_name": admin.UserName,      //收款员
+		"order_number":    order.Number,             //业务流水号
+		"id_card_no":      his.IdCardNo,             //社会保障号
+		"department_name": department.Name,          //科室
+		"number":          his.Number,               //门诊号
+		"date":            order.SettleAccountsDate, //结算日期
+		"name":            order.PsnName,            //姓名
+		"gender":          order.Gend,               //性别
+		"psn_cash_money":  order.PsnCashPay,         //个人支付
+		"pay_way":         "门诊",                     //结算方式
+		"medfee_sumamt":   order.MedfeeSumamt,       //总费用
+		"admin_user_name": admin.UserName,           //收款员
 
 		"bedCostTotal":                                bedCostTotal,
 		"bedCostSelfTotal":                            bedCostSelfTotal,

service/his_service.go

@@ -722,7 +722,9 @@ func (BaseDrugLib) TableName() string {
 }
 
 func GetAllDrugLibList(org_id int64) (list []*BaseDrugLib, err error) {
-	err = readDb.Model(&BaseDrugLib{}).Where("org_id = ?  AND status = 1 AND  find_in_set('停用',drug_status) = 0", org_id).Preload("OtherDrugWarehouseInfo", "status = 1 and (stock_max_number > 0 or stock_min_number >0)").Find(&list).Error
+	err = readDb.Model(&BaseDrugLib{}).Where("org_id = ?  AND status = 1 AND  find_in_set('停用',drug_status) = 0", org_id).Preload("OtherDrugWarehouseInfo", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1 and (stock_max_number > 0 or stock_min_number >0)")
+	}).Find(&list).Error
 	return
 }
 
@@ -2237,7 +2239,6 @@ func GetBaiLinOrderData() (order []*models.NewCustomHisOrder) {
 	return
 }
 
-
 func GetHisDoctorAdviceInfo(id int64) (models.HisDoctorAdviceInfo, error) {
 
 	info := models.HisDoctorAdviceInfo{}