|
@@ -215,8 +215,6 @@ public class SetlListUpldService {
|
|
|
zhongZhenJianHu.add(icuinfoUpld);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
List<PayinfoUpld> payinfo = dao.payinfoUpld(patNo, times, ledgerSn);
|
|
|
List<DiseinfoUpld> diseinfos = dao.diseinfo(patNo, times, flag == 1 ? "zy_dis_diag_yb_modify" : "zy_dis_diag_yb");
|
|
|
setlinfoUpld.setDiagCodeCnt(String.valueOf(diseinfos.size()));
|
|
@@ -281,7 +279,6 @@ public class SetlListUpldService {
|
|
|
temp.getIteminfo().add(heJi);
|
|
|
}
|
|
|
|
|
|
-
|
|
|
// 手术 也是一样的
|
|
|
temp.setOprninfo(EntityCopy.CopyList(flag == 1 ? dao.shouShuXinXi(patNo, times, "batj_ba4_modify") :
|
|
|
dao.shouShuXinXi(patNo, times, "batj_ba4"), OprninfoUpldTemp.class));
|
|
@@ -674,7 +671,6 @@ public class SetlListUpldService {
|
|
|
|
|
|
public ResultVo<IPage<GetDropdownBox>> shouShuBianMa(String content, long currentPage) {
|
|
|
IPage<GetDropdownBox> page = new Page<>();
|
|
|
- log.info("内容:{},页数:{}", content, currentPage);
|
|
|
page.setRecords(dao.searchSurgeryByAlpha(StringUtil.isContainChinese(content), currentPage));
|
|
|
page.setTotal(dao.searchSurgeryTotal(StringUtil.isContainChinese(content)));
|
|
|
return ResultVoUtil.success(page);
|
|
@@ -682,10 +678,13 @@ public class SetlListUpldService {
|
|
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public ResultVo<String> setlModifyReq(ZyInactpatient param) {
|
|
|
- log.info("申请入参:{}", JSONObject.toJSONStringWithDateFormat(param, DateUtil.DEFAULT_PATTERN));
|
|
|
+// log.info("申请入参:{}", JSONObject.toJSONStringWithDateFormat(param, DateUtil.DEFAULT_PATTERN));
|
|
|
param.setLedgerSn(publicServer.getLedgerSn(param.getInpatientNo(), param.getAdmissTimes()));
|
|
|
Set<String> zhenDuanBianMa = new HashSet<>();
|
|
|
Set<String> shouShuBianMa = new HashSet<>();
|
|
|
+
|
|
|
+ log.info("诊断:{}", JSON.toJSONString(param.getYbZyDisDiag()));
|
|
|
+
|
|
|
for (YbZyDisDiag item : param.getYbZyDisDiag()) {
|
|
|
zhenDuanBianMa.add(item.getDisDiag());
|
|
|
if (item.getNewData()) {
|
|
@@ -738,16 +737,16 @@ public class SetlListUpldService {
|
|
|
if (param.getBatjBa4().size() != shouShuBianMa.size()) {
|
|
|
return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "不可以有相同的手术编码。");
|
|
|
}
|
|
|
- dao.delReq(param.getInpatientNo(), param.getAdmissTimes());
|
|
|
- dao.setlModifyReq(param.getInpatientNo(), param.getAdmissTimes(),
|
|
|
- param.getOpIdCode(), param.getOpIdName(), param.getReqRemark());
|
|
|
- if (ListUtil.notBlank(param.getYbZyDisDiag())) {
|
|
|
- dao.setlModDis(param.getYbZyDisDiag(), "zy_dis_diag_yb_modify");
|
|
|
- }
|
|
|
- if (ListUtil.notBlank(param.getBatjBa4())) {
|
|
|
- dao.setlModBat(param.getBatjBa4(), "batj_ba4_modify");
|
|
|
- }
|
|
|
- dao.shenBao(param.getOperation(), param.getDecType(), param.getInpatientNo(), param.getAdmissTimes());
|
|
|
+// dao.delReq(param.getInpatientNo(), param.getAdmissTimes());
|
|
|
+// dao.setlModifyReq(param.getInpatientNo(), param.getAdmissTimes(),
|
|
|
+// param.getOpIdCode(), param.getOpIdName(), param.getReqRemark());
|
|
|
+// if (ListUtil.notBlank(param.getYbZyDisDiag())) {
|
|
|
+// dao.setlModDis(param.getYbZyDisDiag(), "zy_dis_diag_yb_modify");
|
|
|
+// }
|
|
|
+// if (ListUtil.notBlank(param.getBatjBa4())) {
|
|
|
+// dao.setlModBat(param.getBatjBa4(), "batj_ba4_modify");
|
|
|
+// }
|
|
|
+// dao.shenBao(param.getOperation(), param.getDecType(), param.getInpatientNo(), param.getAdmissTimes());
|
|
|
return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION, "申请成功,请等待医保科审核。");
|
|
|
}
|
|
|
|