xinyilu/xinelu-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update===>:增加医生用户名密码的维护。

Browse Source
This commit is contained in:
haown 2023-11-15 14:52:52 +08:00
parent c840df74d1
commit 452f2c441c
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,7 +108,6 @@ public class HospitalPersonInfo extends BaseDomain implements Serializable {
*/ */
@ApiModelProperty(value = "咨询费用") @ApiModelProperty(value = "咨询费用")
@Excel(name = "咨询费用") @Excel(name = "咨询费用")
@NotNull(message = "咨询费用不能为空", groups = {Insert.class, Update.class})
private BigDecimal consultingFee; private BigDecimal consultingFee;
/** /**

4
xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/hospitalpersoninfo/impl/HospitalPersonInfoServiceImpl.java
View File

@ -110,7 +110,7 @@ public class HospitalPersonInfoServiceImpl implements IHospitalPersonInfoService
return AjaxResult.error("您输入的身份证号" + hospitalPersonInfo.getCardNo() + "重复，请重新添加！"); return AjaxResult.error("您输入的身份证号" + hospitalPersonInfo.getCardNo() + "重复，请重新添加！");
} }
} }
if (Objects.nonNull(hospitalPersonInfo.getConsultingFee()) && hospitalPersonInfo.getConsultingFee().compareTo(BigDecimal.ZERO) <= 0) { if (StringUtils.equals("2", hospitalPersonInfo.getStatus()) && (Objects.isNull(hospitalPersonInfo.getConsultingFee()) || hospitalPersonInfo.getConsultingFee().compareTo(BigDecimal.ZERO) <= 0)) {
return AjaxResult.error("咨询费用不能为0或者负数，请重新输入"); return AjaxResult.error("咨询费用不能为0或者负数，请重新输入");
} }
//创建人 创建时间 科室人员编码 //创建人 创建时间 科室人员编码
@ -165,7 +165,7 @@ public class HospitalPersonInfoServiceImpl implements IHospitalPersonInfoService
if (Objects.nonNull(ajaxResult)) { if (Objects.nonNull(ajaxResult)) {
return ajaxResult; return ajaxResult;
} }
if (Objects.nonNull(hospitalPersonInfo.getConsultingFee()) && hospitalPersonInfo.getConsultingFee().compareTo(BigDecimal.ZERO) <= 0) { if (StringUtils.equals("2", hospitalPersonInfo.getStatus()) && (Objects.isNull(hospitalPersonInfo.getConsultingFee()) || hospitalPersonInfo.getConsultingFee().compareTo(BigDecimal.ZERO) <= 0)) {
return AjaxResult.error("咨询费用不能为0或者负数，请重新输入"); return AjaxResult.error("咨询费用不能为0或者负数，请重新输入");
} }
//修改人 修改时间 //修改人 修改时间

3
xinelu-system/src/main/resources/mapper/system/SysUserMapper.xml
View File

@ -87,6 +87,9 @@
AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId},
ancestors) )) ancestors) ))
</if> </if>
<if test="hospitalPersonId != null and hospitalPersonId != 0">
AND u.hospital_person_id = #{hospitalPersonId}
</if>
<!-- 数据范围过滤 --> <!-- 数据范围过滤 -->
${params.dataScope} ${params.dataScope}
</select> </select>