ソースを参照

不能重复添加病程记录

xiaochan 3 年 前
コミット
a5fb68a858

+ 6 - 0
src/main/java/thyyxxk/webserver/controller/zhuyuanyizheng/EmrController.java

@@ -24,6 +24,12 @@ public class EmrController {
         return server.getPatientData(patNo, times);
     }
 
+    @GetMapping("/existCourseRecord")
+    public ResultVo<Boolean> existCourseRecord(@RequestParam("patNo") String patNo,
+                                               @RequestParam("times") Integer times) {
+        return server.existCourseRecord(patNo, times);
+    }
+
     @PostMapping("/insertEmrData")
     public ResultVo<String> insertEmrData(@RequestBody @Validated EmrPatientData param) {
         return server.insertEmrData(param);

+ 5 - 8
src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/EmrServer.java

@@ -43,9 +43,6 @@ public class EmrServer {
 
         for (Map.Entry<String, List<EmrPatientData>> key : map.entrySet()) {
             if (key.getValue().size() == 1) {
-                EmrPatientData parentNode = key.getValue().get(0);
-                String name = parentNode.getName() + "/" + DateUtil.formatDatetime(parentNode.getModifyDate() != null ? parentNode.getModifyDate() : parentNode.getCreateDate());
-                key.getValue().get(0).setName(name);
                 data.add(key.getValue().get(0));
             } else {
                 EmrPatientData item = new EmrPatientData();
@@ -54,8 +51,6 @@ public class EmrServer {
 
                 for (int i = 0, len = key.getValue().size(); i < len; i++) {
                     EmrPatientData childNode = key.getValue().get(i);
-                    String name = childNode.getName() + "/" + DateUtil.formatDatetime(childNode.getModifyDate() != null ? childNode.getModifyDate() : childNode.getCreateDate());
-                    childNode.setName(name);
                     children.add(childNode);
                 }
 
@@ -68,6 +63,10 @@ public class EmrServer {
         return ResultVoUtil.success(data);
     }
 
+    public ResultVo<Boolean> existCourseRecord(String patNo, Integer times) {
+        return ResultVoUtil.success(dao.isThereARecordOfTheCourseOfTheDisease(patNo, times) > 0);
+    }
+
     /**
      * 保存患者电子病历信息
      *
@@ -76,9 +75,7 @@ public class EmrServer {
      */
     public ResultVo<String> insertEmrData(EmrPatientData param) {
         param.setCreateId(TokenUtil.getTokenUserId());
-        if (dao.isThereARecordOfTheCourseOfTheDisease(param.getPatNo(), param.getTimes()) != null) {
-            return ResultVoUtil.fail(ExceptionEnum.INTERNAL_SERVER_ERROR, "该患者已经存在病程记录了,请勿重新填写。");
-        }
+
         try {
             dao.emrInsertForTheFirstTime(param);
         } catch (Exception e) {