医院科室人员校验修改

xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/hospitaldepartmentinfo/HospitalDepartmentInfo.java

@@ -6,9 +6,6 @@ import com.xinelu.common.custominterface.Insert;
 import com.xinelu.common.custominterface.Update;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Objects;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -16,10 +13,14 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.hibernate.validator.constraints.Length;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.Objects;
+
 /**
  * 科室信息管理对象 hospital_department_info
  *
- * @author zh
+ * @author
  * @date 2023-02-13
  */
 @Data
@@ -85,7 +86,7 @@ public class HospitalDepartmentInfo extends BaseDomain {
      */
     @ApiModelProperty(value = "科室负责人名称")
     @Excel(name = "科室负责人名称")
-    @Length(max = 20, message = "科室负责人名称不能超过20位", groups = { Insert.class, Update.class})
+    @Length(max = 20, message = "科室负责人名称不能超过20位", groups = {Insert.class, Update.class})
     private String departmentPerson;
 
     /**
@@ -93,7 +94,6 @@ public class HospitalDepartmentInfo extends BaseDomain {
      */
     @ApiModelProperty(value = "科室地址")
     @Excel(name = "科室地址")
-    @NotBlank(message = "科室地址不能为空", groups = {Insert.class, Update.class})
     @Length(max = 300, message = "科室地址不能超过300位", groups = {Insert.class, Update.class})
     private String departmentAddress;
 

xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/hospitalinfo/HospitalInfo.java

@@ -6,9 +6,6 @@ import com.xinelu.common.custominterface.Insert;
 import com.xinelu.common.custominterface.Update;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.io.Serializable;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -17,6 +14,9 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.hibernate.validator.constraints.Length;
 
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
 /**
  * 健康咨询-医院信息对象 hospital_info
  *
@@ -41,7 +41,7 @@ public class HospitalInfo extends BaseDomain implements Serializable {
      */
     @ApiModelProperty(value = "医院名称")
     @Excel(name = "医院名称")
-    @NotBlank(message = "医院名称不能为空", groups = { Insert.class, Update.class})
+    @NotBlank(message = "医院名称不能为空", groups = {Insert.class, Update.class})
     @Length(max = 50, message = "医院名称不能超过50位", groups = {Insert.class, Update.class})
     private String hospitalName;
 
@@ -57,7 +57,6 @@ public class HospitalInfo extends BaseDomain implements Serializable {
      */
     @ApiModelProperty(value = "医院地址")
     @Excel(name = "医院地址")
-    @NotBlank(message = "医院地址不能为空", groups = {Insert.class, Update.class})
     @Length(max = 300, message = "医院地址不能超过300位", groups = {Insert.class, Update.class})
     private String hospitalAddress;
 
@@ -66,7 +65,6 @@ public class HospitalInfo extends BaseDomain implements Serializable {
      */
     @ApiModelProperty(value = "联系电话，手机号或者座机")
     @Excel(name = "联系电话，手机号或者座机")
-    @NotBlank(message = "联系电话不能为空", groups = {Insert.class, Update.class})
     private String phone;
 
     /**
@@ -74,7 +72,6 @@ public class HospitalInfo extends BaseDomain implements Serializable {
      */
     @ApiModelProperty(value = "医院简介，包含基本信息和医院图片富文本")
     @Excel(name = "医院简介，包含基本信息和医院图片富文本")
-    @NotBlank(message = "医院简介不能为空", groups = {Insert.class, Update.class})
     private String hospitalIntroduce;
 
     /**
@@ -82,7 +79,6 @@ public class HospitalInfo extends BaseDomain implements Serializable {
      */
     @ApiModelProperty(value = "显示顺序")
     @Excel(name = "显示顺序")
-    @NotNull(message = "显示顺序不能为空", groups = {Insert.class, Update.class})
     private Integer hospitalSort;
 
     /**
@@ -91,8 +87,8 @@ public class HospitalInfo extends BaseDomain implements Serializable {
     @ApiModelProperty(value = "家医机构编号")
     private String orgCode;
 
-	@ApiModelProperty(value = "医院类型,1:家医机构，2：齐鲁名医机构，3：专病机构")
+    @ApiModelProperty(value = "医院类型,1:家医机构，2：齐鲁名医机构，3：专病机构")
-	private String category;
+    private String category;
 
     @Override
     public String toString() {
@@ -104,8 +100,8 @@ public class HospitalInfo extends BaseDomain implements Serializable {
                 .append("phone", getPhone())
                 .append("hospitalIntroduce", getHospitalIntroduce())
                 .append("hospitalSort", getHospitalSort())
-	            .append("orgCode", getOrgCode())
+                .append("orgCode", getOrgCode())
-	            .append("category", getCategory())
+                .append("category", getCategory())
                 .append("createBy", getCreateBy())
                 .append("createTime", getCreateTime())
                 .append("updateBy", getUpdateBy())

xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/hospitalpersoninfo/HospitalPersonInfo.java

@@ -51,7 +51,6 @@ public class HospitalPersonInfo extends BaseDomain implements Serializable {
      */
     @ApiModelProperty(value = "所属部门id")
     @Excel(name = "所属部门id")
-    @NotNull(message = "所属部门不能为空！", groups = {Insert.class, Update.class})
     private Long departmentId;
 
     /**
@@ -75,7 +74,6 @@ public class HospitalPersonInfo extends BaseDomain implements Serializable {
      */
     @ApiModelProperty(value = "科室人员联系电话")
     @Excel(name = "科室人员联系电话")
-    @NotBlank(message = "科室人员联系电话不能为空！", groups = {Insert.class, Update.class})
     private String personPhone;
 
     /**
@@ -83,7 +81,6 @@ public class HospitalPersonInfo extends BaseDomain implements Serializable {
      */
     @ApiModelProperty(value = "科室人员地址")
     @Excel(name = "科室人员地址")
-    @NotBlank(message = "科室人员地址不能为空！", groups = {Insert.class, Update.class})
     @Length(max = 300, message = "科室人员地址不能超过300位", groups = {Insert.class, Update.class})
     private String personAddress;
 
@@ -119,7 +116,6 @@ public class HospitalPersonInfo extends BaseDomain implements Serializable {
      */
     @ApiModelProperty(value = "个人简介")
     @Excel(name = "个人简介")
-    @NotBlank(message = "个人简介不能为空！", groups = {Insert.class, Update.class})
     private String personIntroduce;
 
     /**

xinelu-nurse-manage/src/main/resources/mapper/manage/hospitalpersoninfo/HospitalPersonInfoMapper.xml

@@ -95,7 +95,7 @@
         hpi.id,
         hpi.hospital_id,
         hpi.department_id,
-        hdi.hospital_name,
+        hi.hospital_name,
         hdi.department_name,
         hpi.person_code,
         hpi.person_name,
@@ -111,10 +111,11 @@
         hpi.create_time,
         hpi.update_by,
         hpi.update_time,
-        status
+        hpi.status
         FROM
         hospital_person_info hpi
         LEFT JOIN hospital_department_info hdi ON hpi.department_id = hdi.id
+        LEFT JOIN hospital_info hi ON hpi.hospital_id = hi.id
         <where>
             <if test="hospitalId != null ">
                 and hpi.hospital_id = #{hospitalId}
@@ -205,7 +206,7 @@
         SELECT hpi.id,
                hpi.hospital_id,
                hpi.department_id,
-               hdi.hospital_name,
+               hi.hospital_name,
                hdi.department_name,
                hpi.person_code,
                hpi.person_name,
@@ -233,6 +234,7 @@
         FROM hospital_person_info hpi
                  LEFT JOIN hospital_department_info hdi ON hpi.department_id = hdi.id
                  LEFT JOIN hospital_person_certificate hpc ON hpi.id = hpc.hospital_person_id
+                 LEFT JOIN hospital_info hi ON hpi.hospital_id = hi.id
         where hpi.id = #{id}
     </select>