瀏覽代碼

去掉医院的添加判断

ljx 4 年之前
父節點
當前提交
7dba9d5832

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

@@ -24,11 +24,9 @@ public class HospitalSaveDto {
     private Integer isHospital;
 
     @ApiModelProperty(name = "parentId",value = "如果是医院的id,默认为0,如果是院区id,选择医院id")
-    @NotNull(message = "医院/病区的名称不能为空")
     private Integer parentId;
 
     @ApiModelProperty(name = "parentName",value = "如果是医院默认为'',如果是院区带上父医院名称")
-    @NotNull(message = "院区parentName不能为空")
     private String parentName;
 
     @ApiModelProperty(name = "sign",value = "用户自己生成,保证唯一性,如果是院区,不传")

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

@@ -56,8 +56,8 @@ public class CostShareLevelServiceImpl extends ServiceImpl<CostShareLevelMapper,
      * @param costShareLevelSaveDto
      */
     @Override
+    @Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
     public void addCostShareLevel(CostShareLevelSaveDto costShareLevelSaveDto) {
-
         User user = (User) SecurityUtils.getSubject().getPrincipal();
         Integer hospId = user.getHospId();
         CostShareLevel costShareLevel = BeanUtil.convertObj(costShareLevelSaveDto, CostShareLevel.class);

+ 6 - 5
src/main/java/com/imed/costaccount/service/impl/HospitalServiceImpl.java

@@ -132,12 +132,13 @@ public class HospitalServiceImpl extends ServiceImpl<HospitalMapper, Hospital> i
                 throw new CostException(500,"修改院区的时候需要传递医院的Id和医院名称");
             }
         }
-        baseMapper.deleteById(hospital.getId());
         Hospital hospitalRequest = BeanUtil.convertObj(hospitalDto, Hospital.class);
-        hospitalRequest.setId(null);
-        hospitalRequest.setCreateTime(System.currentTimeMillis());
-        hospitalRequest.setSign(hospital.getSign());
-        baseMapper.insert(hospitalRequest);
+        baseMapper.updateById(hospitalRequest);
+//        hospitalRequest.setId(null);
+//        hospitalRequest.setCreateTime(System.currentTimeMillis());
+//        hospitalRequest.setSign(hospital.getSign());
+//        baseMapper.insert(hospitalRequest);
+        // 修改和这个医院相关联的用户的数据
     }
 
     /**