Browse Source

修改医院/院区添加判断

ljx 4 năm trước cách đây
mục cha
commit
a8fdd65749

+ 0 - 2
src/main/java/com/imed/costaccount/model/dto/HospitalDto.java

@@ -32,10 +32,8 @@ public class HospitalDto {
     private Integer isHospital;
 
     @ApiModelProperty(name = "parentId",value = "如果是院区医院的名称,默认为")
-    @NotNull(message = "医院/病区的名称不能为空")
     private Integer parentId;
 
     @ApiModelProperty(name = "parentName",value = "医院唯一标识,院区不存在次内容")
-    @NotNull(message = "医院唯一标识parentName不能为空")
     private String parentName;
 }

+ 7 - 1
src/main/java/com/imed/costaccount/service/impl/HospitalServiceImpl.java

@@ -37,7 +37,7 @@ public class HospitalServiceImpl extends ServiceImpl<HospitalMapper, Hospital> i
     /**
      * 分页查询所有的医院信息
      *
-     * @param page
+     * @param current
      * @param pageSize
      * @return
      */
@@ -126,6 +126,12 @@ public class HospitalServiceImpl extends ServiceImpl<HospitalMapper, Hospital> i
         if (Objects.isNull(hospital)) {
             throw new CostException("不存在相关医院信息");
         }
+        if (NumberConstant.ONE.equals(hospitalDto.getIsHospital())){
+            // 此时修改的是院区  需要传递parent_Id 和 parent__name
+            if (hospitalDto.getParentId()<=0 || StringUtils.isEmpty(hospitalDto.getParentName())){
+                throw new CostException(500,"修改院区的时候需要传递医院的Id和医院名称");
+            }
+        }
         baseMapper.deleteById(hospital.getId());
         Hospital hospitalRequest = BeanUtil.convertObj(hospitalDto, Hospital.class);
         hospitalRequest.setId(null);

+ 1 - 0
src/main/java/com/imed/costaccount/web/LoginController.java

@@ -37,6 +37,7 @@ public class LoginController {
     @PostMapping("/login")
     @ApiOperation("登录操作")
     public Result login(@RequestBody @Valid LoginDTO loginDTO) {
+        loginDTO.setHospSign("AMIlF1mv6bLSPAil");
         LoginVO loginVO = userService.login(loginDTO);
         return Result.ok(loginVO);
     }