|
@@ -33,6 +33,7 @@ import thyyxxk.webserver.entity.medicalinsurance.setllistupldTemp.*;
|
|
|
import thyyxxk.webserver.entity.querydata.JieSuanDanChaXun;
|
|
|
import thyyxxk.webserver.entity.querydata.SiSetlinfoTemp;
|
|
|
import thyyxxk.webserver.service.PublicServer;
|
|
|
+import thyyxxk.webserver.service.casefrontsheet.CaseFrontSheetService;
|
|
|
import thyyxxk.webserver.service.wxapi.SendWxInfoService;
|
|
|
import thyyxxk.webserver.utils.*;
|
|
|
import thyyxxk.webserver.websocket.WebSocketServer;
|
|
@@ -60,9 +61,10 @@ public class SetlListUpldService {
|
|
|
private final PublicServer publicServer;
|
|
|
private final SendWxInfoService sendWxInfoService;
|
|
|
private final SiLogDao logDao;
|
|
|
+ private final CaseFrontSheetService caseFrontSheetService;
|
|
|
|
|
|
public SetlListUpldService(ExecService exec, SiQueryDao queryDao, UpIdCollectionDao upIdCollectionDao,
|
|
|
- DismissDao dismissDao, PublicServer publicServer, SendWxInfoService sendWxInfoService, SiLogDao logDao) {
|
|
|
+ DismissDao dismissDao, PublicServer publicServer, SendWxInfoService sendWxInfoService, SiLogDao logDao, CaseFrontSheetService caseFrontSheetService) {
|
|
|
this.exec = exec;
|
|
|
this.queryDao = queryDao;
|
|
|
this.dao = upIdCollectionDao;
|
|
@@ -70,6 +72,7 @@ public class SetlListUpldService {
|
|
|
this.publicServer = publicServer;
|
|
|
this.sendWxInfoService = sendWxInfoService;
|
|
|
this.logDao = logDao;
|
|
|
+ this.caseFrontSheetService = caseFrontSheetService;
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -569,11 +572,11 @@ public class SetlListUpldService {
|
|
|
Set<String> inpatientNos = new HashSet<>();
|
|
|
for (SiSetlinfoTemp item : page.getRecords()) {
|
|
|
inpatientNos.add(item.getPatNo());
|
|
|
- item.setGendName(item.getGend().equals("1") ? "男" : "女");
|
|
|
+ item.setGendName("1".equals(item.getGend()) ? "男" : "女");
|
|
|
if (item.getClrOptinsName() == null) {
|
|
|
- if (item.getClrOptins().equals("439900")) {
|
|
|
+ if ("439900".equals(item.getClrOptins())) {
|
|
|
item.setClrOptinsName("省本级");
|
|
|
- } else if (item.getClrOptins().equals("430199")) {
|
|
|
+ } else if ("430199".equals(item.getClrOptins())) {
|
|
|
item.setClrOptinsName("市本级");
|
|
|
}
|
|
|
}
|
|
@@ -791,6 +794,15 @@ public class SetlListUpldService {
|
|
|
// 诊断编码
|
|
|
zy.setYbZyDisDiag(dao.zhenDuanXinXi(patNo, times, "zy_dis_diag_yb"));
|
|
|
zy.setNewYbZyDisDiag(dao.zhenDuanXinXi(patNo, times, "zy_dis_diag_yb_modify"));
|
|
|
+
|
|
|
+ for (YbZyDisDiag item : zy.getYbZyDisDiag()) {
|
|
|
+ item.setSsfz(caseFrontSheetService.fetchSsfz(item.getDisDiag().trim(), patNo, times).getData());
|
|
|
+ }
|
|
|
+
|
|
|
+ for (YbZyDisDiag item : zy.getNewYbZyDisDiag()) {
|
|
|
+ item.setSsfz(caseFrontSheetService.fetchSsfz(item.getDisDiag().trim(), patNo, times).getData());
|
|
|
+ }
|
|
|
+
|
|
|
return ResultVoUtil.success(zy);
|
|
|
}
|
|
|
|