Selaa lähdekoodia

兼容老的删除标志

xiaochan 1 kuukausi sitten
vanhempi
commit
ae0687f6bd

+ 0 - 1
src/main/java/thyyxxk/webserver/service/ca/CaServer.java

@@ -21,7 +21,6 @@ import lombok.*;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestParam;
 import thyyxxk.webserver.config.Assertion;
 import thyyxxk.webserver.config.envionment.ArchiveConfig;
 import thyyxxk.webserver.config.envionment.CaData;

+ 9 - 0
src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/emr/EmrServer.java

@@ -661,6 +661,7 @@ public class EmrServer {
         if (publicServer.needRule()) {
             userCode = "";
         }
+
         return ResultVoUtil.success(dao.selectEmrDeteles(patNo, times, userCode));
     }
 
@@ -684,6 +685,14 @@ public class EmrServer {
         if (times == null) {
             return ResultVoUtil.fail(ExceptionEnum.NULL_POINTER, "出院患者无法恢复病历,如果要恢复请先召回在院。");
         }
+        dao.updateDeleteFlag(data.getId());
+
+        TryUtil.ignoreErr(() -> {
+            JSONObject param = new JSONObject();
+            param.put("_id", documentId);
+            param.put("valid", 1);
+            emr.resumeMedicalRecords(documentId, param);
+        });
         return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_EL_MESSAGE, "病历恢复成功。");
     }