恢复电子病历

src/main/java/thyyxxk/webserver/controller/zhuyuanyizheng/EmrController.java

@@ -97,6 +97,11 @@ public class EmrController {
         return server.getDeleteMedicalRecord(patNo);
     }
 
+    @GetMapping("/getInvalidByDocumentId")
+    public ResultVo<JSONObject> getInvalidByDocumentId(@RequestParam("id") String id) {
+        return server.getInvalidByDocumentId(id);
+    }
+
     @GetMapping("/resumeMedicalRecords")
     public ResultVo<String> resumeMedicalRecords(@RequestParam("documentId") String documentId) {
         return server.resumeMedicalRecords(documentId);

src/main/java/thyyxxk/webserver/service/externalhttp/emr/EmrEditor.java

@@ -17,8 +17,11 @@ public interface EmrEditor {
     JSONObject getEditorJsonDataByDocumentId(@Query("id") String id);
 
 
-    @Put("http://172.16.32.125:8001/emr/runtime/api/v1/document/{id}")
+    @Put("http://172.16.32.125:8001/emr/runtime/api/v1/document/recover/{id}")
     JSONObject resumeMedicalRecords(@Var("id") String id,
                                     @JSONBody JSONObject jsonObject);
 
+    @Get("http://172.16.32.125:8001/emr/runtime/api/v1/document/invalid/{id}")
+    JSONObject getInvalidByDocumentIdApi(@Var("id") String id);
+
 }

src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/EmrServer.java

@@ -386,6 +386,10 @@ public class EmrServer {
         return ResultVoUtil.success(dao.selectEmrDeteles(patNo, times, TokenUtil.getTokenUserId()));
     }
 
+    public ResultVo<JSONObject> getInvalidByDocumentId(String id) {
+        return ResultVoUtil.success(emr.getInvalidByDocumentIdApi(id));
+    }
+
 
     /**
      * 恢复电子病历
@@ -406,9 +410,13 @@ public class EmrServer {
         param.put("_id", documentId);
         param.put("valid", 1);
         JSONObject json = emr.resumeMedicalRecords(documentId, param);
-        dao.updateDeleteFlag(data.getId());
-        log.info("恢复：{}", json);
-        return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION);
+        log.info("恢复电子病历：{}", json);
+        if (json.getInteger("ok") == 1) {
+            dao.updateDeleteFlag(data.getId());
+            return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION, "病历恢复成功。");
+        } else {
+            return ResultVoUtil.fail(ExceptionEnum.NULL_POINTER, "病历恢复失败，请重试！");
+        }
     }
 
 }