|
@@ -98,6 +98,7 @@ public class SiMzService {
|
|
|
if (null == mzVisit) {
|
|
|
continue;
|
|
|
}
|
|
|
+ mzVisit.setReceiptNo(Integer.parseInt(hisOrdNumParts[2]));
|
|
|
Map<String, Object> childResult = new HashMap<>(Capacity.FIVE);
|
|
|
childResult.put("times", tempTimes);
|
|
|
childResult.put("mzVisit", mzVisit);
|
|
@@ -105,7 +106,6 @@ public class SiMzService {
|
|
|
queryMzChargeDetailParam.put("patientId", patNo);
|
|
|
queryMzChargeDetailParam.put("times", tempTimes);
|
|
|
queryMzChargeDetailParam.put("receiptNo", hisOrdNumParts[2]);
|
|
|
- mzVisit.setReceiptNo(Integer.parseInt(hisOrdNumParts[2]));
|
|
|
Map<String, Object> mzChargeDetailMap = thmz.unPaidToFullChargeDetail(thmzApiUrl, queryMzChargeDetailParam);
|
|
|
if (null != mzChargeDetailMap && 0 == (int) mzChargeDetailMap.get("resultCode")) {
|
|
|
List<Map<String, Object>> mzChargeDetailList = FilterUtil.cast(mzChargeDetailMap.get("data"));
|
|
@@ -133,6 +133,7 @@ public class SiMzService {
|
|
|
List<OrderNo> orderNos = getOrderNos(patNo, tempTimes, mzVisit.getReceiptNo(), orderReceiptsMap);
|
|
|
childResult.put("orderNos", orderNos);
|
|
|
childResult.put("mzReceipts", orderReceiptsMap);
|
|
|
+ childResult.put("zgmztczf", mzSrvc.getZgmztczf(mzVisit).getData());
|
|
|
finalResult.add(childResult);
|
|
|
}
|
|
|
}
|
|
@@ -145,6 +146,13 @@ public class SiMzService {
|
|
|
if (null == mzChargeList || mzChargeList.isEmpty()) {
|
|
|
return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "没有找到历史处方!");
|
|
|
}
|
|
|
+ for (MzDepositFile depositFile : mzChargeList) {
|
|
|
+ MzVisit mzVisit = new MzVisit();
|
|
|
+ mzVisit.setPatientId(patNo);
|
|
|
+ mzVisit.setTimes(depositFile.getTimes());
|
|
|
+ mzVisit.setReceiptNo(depositFile.getReceiptNo());
|
|
|
+ depositFile.setZgmtzczf(mzSrvc.getZgmztczf(mzVisit).getData());
|
|
|
+ }
|
|
|
return ResultVoUtil.success(mzChargeList);
|
|
|
}
|
|
|
|