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