Merge remote-tracking branch 'origin/master'

src/main/java/com/diagbot/facade/QcCasesEntryHospitalFacade.java

@@ -64,10 +64,14 @@ public class QcCasesEntryHospitalFacade extends QcCasesEntryHospitalServiceImpl
                 .eq("hospital_id", Long.valueOf(SysUserUtils.getCurrentHospitalID()))
                 .set("modifier", SysUserUtils.getCurrentPrincipleID())
                 .set("gmt_modified", DateUtil.now());
-        qcCasesEntry.set(qcCasesEntryUpdataVO.getScore() != null,"score", qcCasesEntryUpdataVO.getScore());
-        qcCasesEntry.set(qcCasesEntryUpdataVO.getMsg() != null,"msg", qcCasesEntryUpdataVO.getMsg());
-        qcCasesEntry.set(qcCasesEntryUpdataVO.getIsUsed() != null,"is_used", qcCasesEntryUpdataVO.getIsUsed());
-        qcCasesEntry.set(qcCasesEntryUpdataVO.getIsReject() != null,"is_reject", qcCasesEntryUpdataVO.getIsReject());
+        qcCasesEntry.set(qcCasesEntryUpdataVO.getScore() != null,
+                "score", qcCasesEntryUpdataVO.getScore());
+        qcCasesEntry.set(qcCasesEntryUpdataVO.getMsg() != null,
+                "msg", qcCasesEntryUpdataVO.getMsg());
+        qcCasesEntry.set(qcCasesEntryUpdataVO.getIsUsed() != null,
+                "is_used", qcCasesEntryUpdataVO.getIsUsed());
+        qcCasesEntry.set(qcCasesEntryUpdataVO.getIsReject() != null,
+                "is_reject", qcCasesEntryUpdataVO.getIsReject());
         return update(new QcCasesEntryHospital(), qcCasesEntry);
     }
 

src/main/java/com/diagbot/vo/QcCasesEntryHospitalVO.java

@@ -1,6 +1,9 @@
 package com.diagbot.vo;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.diagbot.enums.SysTypeEnum;
+import com.diagbot.util.SysUserUtils;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -15,8 +18,8 @@ import javax.validation.constraints.NotNull;
 @Getter
 public class QcCasesEntryHospitalVO extends Page {
 
-    @NotNull(message = "请输入医院id")
-    private Long hospitalId;
+    @ApiModelProperty(hidden = true)
+    private Long hospitalId = Long.valueOf(SysUserUtils.getCurrentHospitalID());
     private Long casesId;
     private String name;
     private Integer isReject;