病历

src/main/java/thyyxxk/webserver/controller/dictionary/EmrDataMaintenanceContorller.java

@@ -3,6 +3,7 @@ package thyyxxk.webserver.controller.dictionary;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.web.bind.annotation.*;
+import thyyxxk.webserver.config.auth.PassToken;
 import thyyxxk.webserver.entity.ResultVo;
 import thyyxxk.webserver.entity.zhuyuanyisheng.EmrDataMaintenance;
 import thyyxxk.webserver.service.dictionary.EmrDataMaintenanceServer;
@@ -42,6 +43,7 @@ public class EmrDataMaintenanceContorller {
     }
 
     @PostMapping("/getEmrInpatientData")
+    @PassToken
     public ResultVo<JSONObject> getEmrInpatientData(@RequestBody EmrDataMaintenance emr) throws Exception {
         return server.getEmrInpatientData(emr.getPatNo(), emr.getTimes());
     }

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

@@ -1,5 +1,6 @@
 package thyyxxk.webserver.controller.zhuyuanyizheng;
 
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import thyyxxk.webserver.entity.ResultVo;
 import thyyxxk.webserver.entity.zhuyuanyisheng.EmrPatientData;
@@ -24,7 +25,7 @@ public class EmrController {
     }
 
     @PostMapping("/insertEmrData")
-    public ResultVo<String> insertEmrData(@RequestBody EmrPatientData param) {
+    public ResultVo<String> insertEmrData(@RequestBody @Validated EmrPatientData param) {
         return server.insertEmrData(param);
     }
 

src/main/java/thyyxxk/webserver/dao/his/zhuyuanyisheng/EmrPatientDao.java

@@ -33,8 +33,8 @@ public interface EmrPatientDao {
 
     @Update("update emr_patient_data " +
             "set name    = #{name}, " +
-            "    modify_date = #{createId}, " +
-            "    modify_id   = getdate() " +
+            "    modify_date = getdate() , " +
+            "    modify_id   = #{createId} " +
             "where pat_no = #{patNo} " +
             "  and times = #{times} " +
             "  and emr_document_id = #{emrDocumentId} ")

src/main/java/thyyxxk/webserver/entity/zhuyuanyisheng/EmrPatientData.java

@@ -5,6 +5,8 @@ import java.io.Serializable;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 import java.util.List;
 
@@ -25,21 +27,28 @@ public class EmrPatientData implements Serializable {
     /**
      * 患者住院号
      */
+    @NotNull(message = "住院号不能为空")
+    @NotBlank(message = "住院号不能为空")
     private String patNo;
 
     /**
      * 患者住院次数
      */
+    @NotNull(message = "患者住院次数不能为空")
     private Integer times;
 
     /**
      * 电子病历中的唯一值
      */
+    @NotNull(message = "电子病历中的唯一值不能为空")
+    @NotBlank(message = "电子病历中的唯一值不能为空")
     private String emrDocumentId;
 
     /**
      * 病历模板编码。
      */
+    @NotNull(message = "病历模板编码不能为空")
+    @NotBlank(message = "病历模板编码不能为空")
     private String emrCategoryCode;
 
     /**
@@ -50,11 +59,15 @@ public class EmrPatientData implements Serializable {
     /**
      * 模板的名称
      */
+    @NotNull(message = "住院号不能为空")
+    @NotBlank(message = "住院号不能为空")
     private String emrName;
 
     /**
      * 医生取得名称
      */
+    @NotNull(message = "住院号不能为空")
+    @NotBlank(message = "住院号不能为空")
     private String name;
 
     /**

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

@@ -80,7 +80,7 @@ public class EmrServer {
             dao.emrInsertForTheFirstTime(param);
         } catch (Exception e) {
             dao.updateCreatedTemplate(param);
-            return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION, "保存成功已经有重复的数据了.");
+            return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION, "保存成功，已覆盖原数据。");
         }
         return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION, "保存到本院成功");
     }