|
@@ -5182,9 +5182,10 @@ func (c *HisApiController) GetFaPiaoData() {
|
5182
|
5182
|
var treatCostPartSelfTotal float64 = 0 //治疗费用
|
5183
|
5183
|
|
5184
|
5184
|
decimal.DivisionPrecision = 2
|
|
5185
|
+ orderInfos_two, _ := service.GetHisOrderDetailByNumber(order.Number, adminUser.CurrentOrgId)
|
5185
|
5186
|
|
5186
|
5187
|
if his.BalanceAccountsType == 2 {
|
5187
|
|
- orderInfos_two, _ := service.GetHisOrderDetailByNumber(order.Number, adminUser.CurrentOrgId)
|
|
5188
|
+ //orderInfos_two, _ := service.GetHisOrderDetailByNumber(order.Number, adminUser.CurrentOrgId)
|
5188
|
5189
|
for _, item := range orderInfos_two {
|
5189
|
5190
|
item.FulamtOwnpayAmt = item.DetItemFeeSumamt
|
5190
|
5191
|
if item.HisDoctorAdviceInfo.ID > 0 && item.HisPrescriptionProject.ID == 0 { //药品
|
|
@@ -5359,6 +5360,7 @@ func (c *HisApiController) GetFaPiaoData() {
|
5359
|
5360
|
"medfee_sumamt": order.MedfeeSumamt, //总费用
|
5360
|
5361
|
"admin_user_name": admin.UserName, //收款员
|
5361
|
5362
|
"order": order,
|
|
5363
|
+ "order_info": orderInfos_two,
|
5362
|
5364
|
"his": his,
|
5363
|
5365
|
"bedCostTotal": bedCostTotal,
|
5364
|
5366
|
"bedCostSelfTotal": bedCostSelfTotal,
|