|
@@ -6170,6 +6170,8 @@ func (c *HisApiController) GetFaPiaoData() {
|
6170
|
6170
|
|
6171
|
6171
|
his_hospital_record, _ := service.GetInHospitalRecordByNumber(order.MdtrtId)
|
6172
|
6172
|
|
|
6173
|
+ patient, _ := service.GetPatientByID(adminUser.CurrentOrgId, patient_id)
|
|
6174
|
+
|
6173
|
6175
|
//prescriptions, _ := service.GetHisPrescriptionThree(adminUser.CurrentOrgId, patient_id, order.Number)
|
6174
|
6176
|
|
6175
|
6177
|
var bedCostTotal float64 = 0 //床位总费
|
|
@@ -6505,7 +6507,7 @@ func (c *HisApiController) GetFaPiaoData() {
|
6505
|
6507
|
"number": his.Number, //门诊号
|
6506
|
6508
|
"date": order.SettleAccountsDate, //结算日期
|
6507
|
6509
|
"name": order.PsnName, //姓名
|
6508
|
|
- "gender": order.Gend, //性别
|
|
6510
|
+ "gender": patient.Gender, //性别
|
6509
|
6511
|
"psn_cash_money": order.PsnCashPay, //个人支付
|
6510
|
6512
|
"pay_way": "门诊", //结算方式
|
6511
|
6513
|
"medfee_sumamt": order.MedfeeSumamt, //总费用
|