|
@@ -26,44 +26,6 @@ public class EmrAuditServer {
|
|
|
this.dao = dao;
|
|
|
}
|
|
|
|
|
|
- public ResultVo<JSONObject> getAuditMessages(String id, String code, Integer finalControl) {
|
|
|
- List<EmrAuditDetail> auditData = dao.selectedMessage(id, finalControl);
|
|
|
- List<EmrAuditDetail> templateData = dao.selectedLink(code);
|
|
|
-
|
|
|
- JSONObject js = new JSONObject();
|
|
|
- Integer count = dao.selectIsHistoryCount(id);
|
|
|
- js.put("historyCount", count == null ? 0 : count);
|
|
|
-
|
|
|
- if (ListUtil.notBlank(auditData)) {
|
|
|
- Map<String, EmrAuditDetail> map = auditData.stream().collect(
|
|
|
- Collectors.toMap(EmrAuditDetail::getName, a -> a, (k1, k2) -> k1));
|
|
|
-
|
|
|
- List<EmrAuditDetail> temporaryData = new LinkedList<>();
|
|
|
-
|
|
|
- templateData.forEach(item -> {
|
|
|
- EmrAuditDetail temp = map.get(item.getName());
|
|
|
- if (temp != null) {
|
|
|
- temp.setMatching(true);
|
|
|
- temporaryData.add(temp);
|
|
|
- } else {
|
|
|
- temporaryData.add(item);
|
|
|
- }
|
|
|
- });
|
|
|
-
|
|
|
- auditData.forEach(item -> {
|
|
|
- if (!item.getMatching()) {
|
|
|
- temporaryData.add(item);
|
|
|
- }
|
|
|
- });
|
|
|
- js.put("data", temporaryData);
|
|
|
- return ResultVoUtil.success(js);
|
|
|
- }
|
|
|
-
|
|
|
- js.put("data", templateData);
|
|
|
- return ResultVoUtil.success(js);
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
public ResultVo<String> setAudit(EmrSetAudit data) {
|
|
|
if (ListUtil.isBlank(data.getList())) {
|
|
|
return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "请选择质控数据");
|