wangzhinan 2 лет назад
Родитель
Сommit
fa3ea0045f

+ 4 - 4
svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedOrderService.java

@ -789,7 +789,7 @@ public class MedOrderService {
                object.put("doctorName",ylzMedicalRelationDO.getDrName());
            }
            if (feeInfo.contains("hisSettleNo")){
                object.put("hisSettleNo",ylzMedicalRelationDO.getRelationCode());
                object.put("hisSettleNo",ylzMedicalRelationDO.getRelationCode()==null?"无":ylzMedicalRelationDO.getRelationCode());
            }
            if (feeInfo.contains("applyTime")){
                object.put("applyTime",ylzMedicalRelationDO.getApplyTime());
@ -813,18 +813,18 @@ public class MedOrderService {
                object.put("balance",ylzMedicalRelationDO.getBalance());
            }
            if (feeInfo.contains("accountBalance")){
                object.put("accountBalance",ylzMedicalRelationDO.getAccountBalance());
                object.put("accountBalance",ylzMedicalRelationDO.getAccountBalance()==null?"0":ylzMedicalRelationDO.getAccountBalance());
            }
            if (feeInfo.contains("drugName")){
                List<YlzMedicalMxDO> medicalMxDOS = ylzMedicailMxDao.findByMedicalId(ylzMedicalRelationDO.getId());
                JSONArray array = new JSONArray();
                for (YlzMedicalMxDO mxDO:medicalMxDOS){
                    JSONObject mxObj = new JSONObject();
                    mxObj.put("drugName",mxDO.getItemName());
                    mxObj.put("drugName",mxDO.getHisItemName());
                    mxObj.put("money",mxDO.getTotalMoney());
                    mxObj.put("count",mxDO.getAmount());
                    mxObj.put("unit",mxDO.getChargeUnitName());
                    mxObj.put("specification",mxDO.getSpecificationType());
                    mxObj.put("specification",mxDO.getSpecificationType()==null?"无":mxDO.getSpecificationType());
                    array.add(mxObj);
                }
                object.put("itemList",array);