2
0
Эх сурвалжийг харах

修改是否是医院的标识

ljx 4 жил өмнө
parent
commit
bb9e4a1ac0

+ 4 - 0
src/main/java/com/imed/costaccount/model/CostShareParam.java

@@ -38,6 +38,10 @@ public class CostShareParam implements Serializable {
 	 * 分摊代码
 	 */
 	private String shareParamCode;
+	/**
+	 * 关联的会计成本的科目的Id
+	 */
+	private String accoutingId;
 	/**
 	 * 医院Id
 	 */

+ 3 - 3
src/main/java/com/imed/costaccount/model/vo/HosptailVO.java → src/main/java/com/imed/costaccount/model/vo/HospitalVO.java

@@ -15,7 +15,7 @@ import lombok.*;
 @NoArgsConstructor
 @Builder
 @ApiModel
-public class HosptailVO {
+public class HospitalVO {
 
     @ApiModelProperty(name = "id",value = "医院或者病区Id")
     private Integer id;
@@ -23,8 +23,8 @@ public class HosptailVO {
     @ApiModelProperty(name = "name",value = "医院或院区名称")
     private String name;
 
-    @ApiModelProperty(name = "is_hosptail",value = "是否为院区(0.不是,1.是)默认为0")
-    private Integer isHosptail;
+    @ApiModelProperty(name = "is_hospital",value = "是否为院区(0.不是,1.是)默认为0")
+    private Integer isHospital;
 
     @ApiModelProperty(name = "sign",value = "如果是院区医院的id,默认为0")
     private String sign;

+ 4 - 3
src/main/java/com/imed/costaccount/service/impl/HospitalServiceImpl.java

@@ -13,7 +13,7 @@ import com.imed.costaccount.model.dto.HospitalDto;
 import com.imed.costaccount.model.dto.HospitalSaveDto;
 import com.imed.costaccount.model.vo.CommonVO;
 import com.imed.costaccount.model.vo.HospitalAllVO;
-import com.imed.costaccount.model.vo.HosptailVO;
+import com.imed.costaccount.model.vo.HospitalVO;
 import com.imed.costaccount.service.HospitalService;
 import com.imed.costaccount.utils.BeanUtil;
 import org.springframework.stereotype.Service;
@@ -46,9 +46,9 @@ public class HospitalServiceImpl extends ServiceImpl<HospitalMapper, Hospital> i
 //                .eq(!StringUtils.isEmpty(hospId), Hospital::getId, hospId)
                 .like(!StringUtils.isEmpty(name), Hospital::getName, name));
         List<Hospital> records = pages.getRecords();
-        List<HosptailVO> hosptailVOList = BeanUtil.convertList(records, HosptailVO.class);
+        List<HospitalVO> hospitalVOList = BeanUtil.convertList(records, HospitalVO.class);
         PageUtils pageUtils = new PageUtils(pages);
-        pageUtils.setList(hosptailVOList);
+        pageUtils.setList(hospitalVOList);
         return pageUtils;
     }
 
@@ -70,6 +70,7 @@ public class HospitalServiceImpl extends ServiceImpl<HospitalMapper, Hospital> i
     // 校验参数
     private void checkParam(HospitalSaveDto hospitalSaveDto, String sign) {
         Integer isHospital = hospitalSaveDto.getIsHospital();
+        // 新增医院
         if (isHospital == 0) {
             if (StringUtils.isEmpty(sign)) {
                 throw new CostException(500, "新增医院请选择医院标识");

+ 2 - 0
src/main/java/com/imed/costaccount/service/impl/UserServiceImpl.java

@@ -145,6 +145,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     @Override
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public void updateByUser(UserDto userDto) {
+        User userOne = (User) SecurityUtils.getSubject().getPrincipal();
         User user = baseMapper.selectOne(new QueryWrapper<User>().lambda().like(
                 !StringUtils.isEmpty(userDto.getId()), User::getId, userDto.getId()));
         if (Objects.isNull(user)) {
@@ -155,6 +156,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         userRequest.setId(null);
         userRequest.setHospitalStatus(userDto.getHospitalStatus());
         userRequest.setCreateTime(System.currentTimeMillis());
+        userRequest.setHospId(userOne.getHospId());
         if (!StringUtils.isEmpty(userDto.getPassword())) {
             String newPassWord = SecureUtil.md5(userDto.getPassword());
             userRequest.setPassword(newPassWord);