ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
@@ -293,9 +293,10 @@ if(null !=tjCustomer.getIdType()){ if(tjCustomer.getIdType().equals("1")){ b = MatchUtils.isIdCard(cusIdcard); }else { b = MatchUtils.cardValidate(cusIdcard, tjCustomer.getIdType()); } // else { // b = MatchUtils.cardValidate(cusIdcard, tjCustomer.getIdType()); // } }else { return AjaxResult.error("请选择证件类型"); } @@ -320,7 +321,9 @@ String substring = cusIdcard.substring(cusIdcard.length() - 6); substring = DigestUtils.md5DigestAsHex(substring.getBytes()); tjCustomer.setCusPassword(substring); tjCustomer.setCusBrithday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjCustomer.getCusIdcard()), "yyyy-MM-dd")); if(tjCustomer.getIdType().equals("1")){ tjCustomer.setCusBrithday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjCustomer.getCusIdcard()), "yyyy-MM-dd")); } tjCustomer.setCusNumber(0L); if (tjCustomerService.save(tjCustomer)) { return AjaxResult.success(tjCustomer); ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java
@@ -104,10 +104,15 @@ || (null==tjDwGrouping.getPacName()||"".equals(tjDwGrouping.getPacName()))){ return AjaxResult.error("必填项不能为空!"); } int i = tjDwGroupingService.selectTjDwGroupingBySex(tjDwGrouping.getDwDeptId(), tjDwGrouping.getSex()); if(i>0){ return AjaxResult.error("该性别分组已存在不可重复创建"); } tjDwGrouping.setDwDeptName(compService.getById(tjDwGrouping.getDwId()).getCnName()); if (tjDwGroupingService.saveOrUpdate(tjDwGrouping)) { if(null !=tjDwGrouping.getMapList() && tjDwGrouping.getMapList().size()>0){ // groupingProService.remove(new LambdaQueryWrapper<TjGroupingPro>().eq(TjGroupingPro::getGroupingId,tjDwGrouping.getId())); // TODO: 2023/12/25 按照性别删除 groupingProService.deletedTjGroupingProByGroupingId(tjDwGrouping.getId()); for (Map<String, Object> map : tjDwGrouping.getMapList()) { TjGroupingPro groupingPro=new TjGroupingPro(); ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjDwGroupingMapper.java
@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ltkj.hosp.domain.TjDwGrouping; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; /** * 体检单位分组Mapper接口 @@ -61,4 +63,8 @@ * @return 结果 */ public int deleteTjDwGroupingByIds(String[] ids); @Select("SELECT COUNT(*) FROM tj_dw_grouping a WHERE a.dw_dept_id=#{dwDeptId} AND a.sex=#{sex} ") public int selectTjDwGroupingBySex(@Param("dwDeptId")String dwDeptId,@Param("sex") String sex); } ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjDwGroupingService.java
@@ -59,4 +59,7 @@ * @return 结果 */ public int deleteTjDwGroupingById(String id); public int selectTjDwGroupingBySex(String dwDeptId,String sex); } ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjDwGroupingServiceImpl.java
@@ -89,4 +89,9 @@ public int deleteTjDwGroupingById(String id) { return tjDwGroupingMapper.deleteTjDwGroupingById(id); } @Override public int selectTjDwGroupingBySex(String dwDeptId, String sex) { return tjDwGroupingMapper.selectTjDwGroupingBySex(dwDeptId,sex); } }