电子病历恢复

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

@@ -18,6 +18,7 @@ public interface EmrEditor {
 
 
     @Put("http://172.16.32.125:8001/emr/runtime/api/v1/document/{id}")
-    JSONObject resumeMedicalRecords(@Var("id") String id, @JSONBody("valid") int valid);
+    JSONObject resumeMedicalRecords(@Var("id") String id,
+                                    @JSONBody JSONObject jsonObject);
 
 }

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

@@ -401,7 +401,10 @@ public class EmrServer {
         if (times == null) {
             return ResultVoUtil.fail(ExceptionEnum.NULL_POINTER, "出院患者无法恢复病历，如果要恢复请先召回在院。");
         }
-        JSONObject json = emr.resumeMedicalRecords(documentId, 1);
+        JSONObject param = new JSONObject();
+        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);

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

@@ -438,7 +438,7 @@ public class JianYanJianChaShenQingServer {
             xm.add(item.getOrderCode().trim());
             content.add(String.format("%s：<span style='color:#409eff'>【%s】</span><br>" +
                             "患者姓名：<span style='color:#409eff'>【%s】</span><br>" +
-                            "床位：<span style='color:#409eff'>【%s】</span>", param.getReqType().equals("2") ? "检查名" : "检验名",
+                            "床位：<span style='color:#409eff'>【%s】</span>", "2".equals(param.getReqType()) ? "检查名" : "检验名",
                     item.getOrderName(), huanZheXinXi.getName(), huanZheXinXi.getBedNo()));
             index++;
         }
@@ -462,7 +462,6 @@ public class JianYanJianChaShenQingServer {
         log.info("数据：{}", JSON.toJSONString(param.getList()));
         dao.chaRuShenQingYiZhu(param.getList(), param.getInpatientNo(), param.getAdmissTimes(), userCode, huanZheXinXi.getDeptCode(), huanZheXinXi.getDeptCode(),
                 PublicServer.getInfantFlag(param.getInpatientNo()));
-
         publicServer.faSongXiaoXi(huanZheXinXi, content, "2".equals(param.getReqType()) ? "新增检查" : "新增检验", TokenUtil.getTokenUserId());
         return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION);
     }