ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
@@ -97,9 +97,12 @@ LtkjTjPat tjPatByIdCard = testMapper.getTjPatByIdCard(cusIdcard); if(null != tjPatByIdCard){ String fcardNo = tjPatByIdCard.getFcardNo(); if(null !=fcardNo){ if(null !=fcardNo && !fcardNo.equals("")){ fcardNo=fcardNo.trim(); tjPatByIdCard.setFcardNo(fcardNo); }else { fcardNo=cusIdcard.trim(); tjPatByIdCard.setFcardNo(fcardNo); } //根据身份证号从数据库拿信息 没有的话保存 LtkjTjPat ltkjTjPat = tjvLtkjvtjpatService.getLtkjTjPatByCusIdCard(cusIdcard); ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
@@ -543,6 +543,7 @@ tjProjectList = detailService.selectTjOrderDetailListByFlowingWaterIdIsNotNull(OrderId); } String pacId = transitionService.selectPacIdByTbTransitionTjNumAndProId(order.getTjNumber()); String s = tjFlowingWaterService.getDiscount(OrderId); if (null != tjProjectList && tjProjectList.size() > 0) { for (TjProject project : tjProjectList) { if (project.getProParentId() == 0) { @@ -576,7 +577,6 @@ project.setProOrdPrice(new BigDecimal("0.00").setScale(2)); } }*/ String s = tjFlowingWaterService.getDiscount(OrderId); if (null != pacId) { TjPackageProject pp = tjPackageProjectService.getOne(new LambdaQueryWrapper<TjPackageProject>().eq(TjPackageProject::getPacId, pacId) .eq(TjPackageProject::getProId, String.valueOf(project.getProId()))); @@ -593,17 +593,22 @@ } } } TjPackageProject ppp = tjPackageProjectService.getOne(new LambdaQueryWrapper<TjPackageProject>().eq(TjPackageProject::getPacId, pacId) .eq(TjPackageProject::getProId, "1735504273274236929")); List<TjFlowingWater> list = tjFlowingWaterService.list(new LambdaQueryWrapper<TjFlowingWater>() .eq(TjFlowingWater::getOrderId, order) .eq(TjFlowingWater::getPayStasus, 2)); if (null != ppp && tjProjectList.size() > 0 && null != list && list.size() > 0) { TjProject project = projectService.selectTjProjectByProId(1735504273274236929L); project.setProOrdPrice(project.getProPrice()); if (null != list && list.size() > 0) { List<TjProject> projectList = projectService.getTjProListByPacIdAndDeptId(pacId); if(null !=projectList && projectList.size()>0){ for (TjProject project : projectList) { project.setProOrdPrice(tjPackageProjectService.getPacProPriceByPacIdAndPro(project.getProId(),pacId) .multiply(new BigDecimal(s)).setScale(2)); tjProjectList.add(project); } } } } return AjaxResult.success(tjProjectList); } } ltkj-admin/src/main/resources/application.yml
@@ -11,8 +11,8 @@ # 文件路径 示例（ Windows配置D:/ltkj/uploadPath，Linux配置 /home/ltkj/uploadPath） # 用户换头像后的图片存储地址 测试：D:\ltkj\uploadPath\avatar\2022\12\14 #profile: D:/ltkj/uploadPath profile: https://ltpeis.xaltjdkj.cn:5502/uploadPath # profile: http://192.168.0.5:5502/uploadPath # profile: https://ltpeis.xaltjdkj.cn:5502/uploadPath profile: http://192.168.0.5:5502/uploadPath # 获取ip地址开关 addressEnabled: true @@ -73,15 +73,15 @@ # redis 配置 redis: # 地址 host: 101.42.27.146 # host: localhost # host: 101.42.27.146 host: localhost # 端口，默认为6379 port: 6379 # 数据库索引 database: 0 # 密码 password: 654321 # password: 123456 # password: 654321 password: 123456 # 连接超时时间 timeout: 120s lettuce: @@ -180,8 +180,8 @@ # 体检套餐和轮播图存储路径 photoPath: D:\AppPhoto\uploadPath\ # nginx图片服务器 photoServer: https://ltpeis.xaltjdkj.cn:5502/uploadPath/ #photoServer: http://192.168.0.5:5502/uploadPath/ #photoServer: https://ltpeis.xaltjdkj.cn:5502/uploadPath/ photoServer: http://192.168.0.5:5502/uploadPath/ # 微信小程序appid secret xcx: @@ -211,8 +211,8 @@ #积木报表访问地址 jimu: # path: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin path: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin # path: http://192.168.0.5:5000/ltkj-admin # path: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin path: http://192.168.0.5:5000/ltkj-admin # path: http://10.168.0.9:5011 # path: http://192.168.0.105:5011 # path: http://192.168.0.99:8081/ltkj-admin ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java
@@ -121,4 +121,13 @@ "on c.pro_parent_id=b.pro_id\n" + ") d\n") List<TjProject> getProBySqlAndName(@Param("proName")String proName,@Param("checkType")String checkType,@Param("deptId")String deptId); @Select("SELECT * FROM (\n" + "SELECT * FROM tj_package_project a WHERE a.pac_id=#{pacId} AND a.pro_id IN\n" + "(\n" + " SELECT b.pro_id FROM tj_project b WHERE b.pro_parent_id=0 AND b.dept_id='259'\n" + ")) aa LEFT JOIN tj_project c ON aa.pro_id=c.pro_id ") List<TjProject> getTjProListByPacIdAndDeptId(String pacId); } ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java
@@ -103,4 +103,6 @@ List<TjProject> getProBySqlAndName(String proName,String checkType,String deptId); List<TjProject> getTjProListByPacIdAndDeptId(String pacId); } ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java
@@ -191,6 +191,11 @@ return tjProjectMapper.getProBySqlAndName(proName,checkType,deptId); } @Override public List<TjProject> getTjProListByPacIdAndDeptId(String pacId) { return tjProjectMapper.getTjProListByPacIdAndDeptId(pacId); } /** * 递归列表 */ @@ -226,4 +231,8 @@ private boolean hasChild(List<TjProject> list, TjProject t) { return getChildList(list, t).size() > 0; } }
