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

controllers/his_api_controller.go

@@ -5350,45 +5350,46 @@ 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.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,
-		"bedCostPartSelfTotal":                        bedCostPartSelfTotal,
-		"operationCostTotal":                          operationCostTotal,
-		"operationCostSelfTotal":                      operationCostSelfTotal,
-		"operationCostPartSelfTotal":                  operationCostPartSelfTotal,
-		"otherCostTotal":                              otherCostTotal,
-		"otherCostSelfTotal":                          otherCostSelfTotal,
-		"otherCostPartSelfTotal":                      otherCostPartSelfTotal,
-		"materialCostTotal":                           materialCostTotal,
-		"materialCostSelfTotal":                       materialCostSelfTotal,
-		"materialCostPartSelfTotal":                   materialCostPartSelfTotal,
-		"westernMedicineCostTotal":                    westernMedicineCostTotal,
-		"westernMedicineCostSelfTotal":                westernMedicineCostSelfTotal,
-		"westernMedicineCostPartSelfTotal":            westernMedicineCostPartSelfTotal,
-		"chineseTraditionalMedicineCostTotal":         chineseTraditionalMedicineCostTotal,
+		"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,           //收款员
+		"order":                               order,
+		"his":                                 his,
+		"bedCostTotal":                        bedCostTotal,
+		"bedCostSelfTotal":                    bedCostSelfTotal,
+		"bedCostPartSelfTotal":                bedCostPartSelfTotal,
+		"operationCostTotal":                  operationCostTotal,
+		"operationCostSelfTotal":              operationCostSelfTotal,
+		"operationCostPartSelfTotal":          operationCostPartSelfTotal,
+		"otherCostTotal":                      otherCostTotal,
+		"otherCostSelfTotal":                  otherCostSelfTotal,
+		"otherCostPartSelfTotal":              otherCostPartSelfTotal,
+		"materialCostTotal":                   materialCostTotal,
+		"materialCostSelfTotal":               materialCostSelfTotal,
+		"materialCostPartSelfTotal":           materialCostPartSelfTotal,
+		"westernMedicineCostTotal":            westernMedicineCostTotal,
+		"westernMedicineCostSelfTotal":        westernMedicineCostSelfTotal,
+		"westernMedicineCostPartSelfTotal":    westernMedicineCostPartSelfTotal,
+		"chineseTraditionalMedicineCostTotal": chineseTraditionalMedicineCostTotal,
 		"chineseTraditionalMedicineCostSelfTotal":     chineseTraditionalMedicineCostSelfTotal,
 		"chineseTraditionalMedicineCostPartSelfTotal": chineseTraditionalMedicineCostPartSelfTotal,
-		"checkCostTotal":                              checkCostTotal,
-		"checkCostSelfTotal":                          checkCostSelfTotal,
-		"checkCostPartSelfTotal":                      checkCostPartSelfTotal,
-		"laboratoryCostTotal":                         laboratoryCostTotal,
-		"laboratoryCostSelfTotal":                     laboratoryCostSelfTotal,
-		"laboratoryCostPartSelfTotal":                 laboratoryCostPartSelfTotal,
-		"treatCostTotal":                              treatCostTotal,
-		"treatCostSelfTotal":                          treatCostSelfTotal,
-		"treatCostPartSelfTotal":                      treatCostPartSelfTotal,
+		"checkCostTotal":              checkCostTotal,
+		"checkCostSelfTotal":          checkCostSelfTotal,
+		"checkCostPartSelfTotal":      checkCostPartSelfTotal,
+		"laboratoryCostTotal":         laboratoryCostTotal,
+		"laboratoryCostSelfTotal":     laboratoryCostSelfTotal,
+		"laboratoryCostPartSelfTotal": laboratoryCostPartSelfTotal,
+		"treatCostTotal":              treatCostTotal,
+		"treatCostSelfTotal":          treatCostSelfTotal,
+		"treatCostPartSelfTotal":      treatCostPartSelfTotal,
 	})
 
 }

models/self_drug_models.go

@@ -39,39 +39,41 @@ type XtBaseDrug struct {
 	DrugDose               float64 `gorm:"column:drug_dose" json:"drug_dose" form:"drug_dose"`
 	DrugDoseUnit           int64   `gorm:"column:drug_dose_unit" json:"drug_dose_unit" form:"drug_dose_unit"`
 	MedicalInsuranceNumber string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
-	Manufacturer           int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	PharmacologyCategory   int64   `gorm:"column:pharmacology_category" json:"pharmacology_category" form:"pharmacology_category"`
-	StatisticsCategory     int64   `gorm:"column:statistics_category" json:"statistics_category" form:"statistics_category"`
-	Code                   string  `gorm:"column:code" json:"code" form:"code"`
-	IsSpecialDiseases      int64   `gorm:"column:is_special_diseases" json:"is_special_diseases" form:"is_special_diseases"`
-	IsRecord               int64   `gorm:"column:is_record" json:"is_record" form:"is_record"`
-	Agent                  string  `gorm:"column:agent" json:"agent" form:"agent"`
-	DrugStatus             string  `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
-	LimitRemark            string  `gorm:"column:limit_remark" json:"limit_remark" form:"limit_remark"`
-	DeliveryWay            string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
-	ExecutionFrequency     string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
-	SingleDose             float64 `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
-	PrescribingNumber      float64 `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
-	Label                  int64   `gorm:"column:label" json:"label" form:"label"`
-	Sort                   int64   `gorm:"column:sort" json:"sort" form:"sort"`
-	IsUseDoctorAdvice      int64   `gorm:"column:is_use_doctor_advice" json:"is_use_doctor_advice" form:"is_use_doctor_advice"`
-	IsDefault              int64   `gorm:"column:is_default" json:"is_default" form:"is_default"`
-	IsChargePredict        int64   `gorm:"column:is_charge_predict" json:"is_charge_predict" form:"is_charge_predict"`
-	IsStatisticsWork       int64   `gorm:"column:is_statistics_work" json:"is_statistics_work" form:"is_statistics_work"`
-	IsChargeUse            int64   `gorm:"column:is_charge_use" json:"is_charge_use" form:"is_charge_use"`
-	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"`
-	OrgId                  int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	HospApprFlag           int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
-	LmtUsedFlag            int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
-	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"`
+	ProvincesCode          string  `gorm:"column:provinces_code" json:"provinces_code" form:"provinces_code"`
+
+	Manufacturer          int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	PharmacologyCategory  int64   `gorm:"column:pharmacology_category" json:"pharmacology_category" form:"pharmacology_category"`
+	StatisticsCategory    int64   `gorm:"column:statistics_category" json:"statistics_category" form:"statistics_category"`
+	Code                  string  `gorm:"column:code" json:"code" form:"code"`
+	IsSpecialDiseases     int64   `gorm:"column:is_special_diseases" json:"is_special_diseases" form:"is_special_diseases"`
+	IsRecord              int64   `gorm:"column:is_record" json:"is_record" form:"is_record"`
+	Agent                 string  `gorm:"column:agent" json:"agent" form:"agent"`
+	DrugStatus            string  `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
+	LimitRemark           string  `gorm:"column:limit_remark" json:"limit_remark" form:"limit_remark"`
+	DeliveryWay           string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency    string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	SingleDose            float64 `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	PrescribingNumber     float64 `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
+	Label                 int64   `gorm:"column:label" json:"label" form:"label"`
+	Sort                  int64   `gorm:"column:sort" json:"sort" form:"sort"`
+	IsUseDoctorAdvice     int64   `gorm:"column:is_use_doctor_advice" json:"is_use_doctor_advice" form:"is_use_doctor_advice"`
+	IsDefault             int64   `gorm:"column:is_default" json:"is_default" form:"is_default"`
+	IsChargePredict       int64   `gorm:"column:is_charge_predict" json:"is_charge_predict" form:"is_charge_predict"`
+	IsStatisticsWork      int64   `gorm:"column:is_statistics_work" json:"is_statistics_work" form:"is_statistics_work"`
+	IsChargeUse           int64   `gorm:"column:is_charge_use" json:"is_charge_use" form:"is_charge_use"`
+	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"`
+	OrgId                 int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	HospApprFlag          int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
+	LmtUsedFlag           int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
+	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 {