|
@@ -53,13 +53,12 @@ public class SiZyService {
|
|
|
private final SiLogDao logDao;
|
|
|
private final ExecService exec;
|
|
|
private final DismissService dismissService;
|
|
|
- private final SetlListUpldService setlListUpldService;
|
|
|
private final SiZySrvc zySrvc;
|
|
|
|
|
|
@Autowired
|
|
|
public SiZyService(SiZyDao dao, SiQueryDao qrydao, SiSetlinfoDao setlinfoDao,
|
|
|
SiSetldetailDao setldetldao, SiChargeTempDao chrgtmpdao, SiLogDao logDao, ExecService exec,
|
|
|
- DismissService dismissService, SetlListUpldService setlListUpldService, SiZySrvc zySrvc) {
|
|
|
+ DismissService dismissService, SiZySrvc zySrvc) {
|
|
|
this.dao = dao;
|
|
|
this.qrydao = qrydao;
|
|
|
this.setlinfodao = setlinfoDao;
|
|
@@ -68,7 +67,6 @@ public class SiZyService {
|
|
|
this.logDao = logDao;
|
|
|
this.exec = exec;
|
|
|
this.dismissService = dismissService;
|
|
|
- this.setlListUpldService = setlListUpldService;
|
|
|
this.zySrvc = zySrvc;
|
|
|
}
|
|
|
|
|
@@ -451,7 +449,8 @@ public class SiZyService {
|
|
|
setlEntity.setInsuplcAdmdvs(preSetlmt.getInsuplcAdmdvs());
|
|
|
setlEntity.setBegntime(begntime);
|
|
|
setlEntity.setEndtime(p.getDismissDate());
|
|
|
- setlEntity.setHiPaymtd(calculateHiPaymtd(preSetlmt.getInsuplcAdmdvs(), setlEntity.getInsutype(), setlEntity.getMedType()));
|
|
|
+ setlEntity.setHiPaymtd(calculateHiPaymtd(setlEntity));
|
|
|
+ setlEntity.setMedinsType(MedInsTypeUtil.getMedInsType(setlEntity));
|
|
|
setlinfodao.insert(setlEntity);
|
|
|
setlinfodao.updateSiZyInfoSetlId(p.getInpatientNo(), p.getAdmissTimes(), p.getLedgerSn(),
|
|
|
setlEntity.getSetlId(), setlEntity.getMedinsSetlId(), input.getString("msgid"));
|
|
@@ -488,7 +487,10 @@ public class SiZyService {
|
|
|
return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, result.getString(ERROR_MESSAGE));
|
|
|
}
|
|
|
|
|
|
- private int calculateHiPaymtd(String insuplcAdmdvs, String insutype, String medType) {
|
|
|
+ private int calculateHiPaymtd(SiSetlinfo setlInfo) {
|
|
|
+ String medType = setlInfo.getMedType();
|
|
|
+ String insuplcAdmdvs = setlInfo.getInsuplcAdmdvs();
|
|
|
+ String insutype = setlInfo.getInsutype();
|
|
|
if (medType.equals("2101") || medType.equals("22")) {
|
|
|
List<String> insuplcAdmdvses = Arrays.asList("430121", "430181");
|
|
|
List<String> insutypes = Arrays.asList("340", "350");
|