From 8cf225a3c519b49a2f62f4b627cec4002348082d Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期二, 30 一月 2024 08:27:07 +0800
Subject: [PATCH] zjh 本地 2024/01/30 -1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java | 19 ++++++---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java | 9 ++++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java | 2 +
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java | 5 ++
ltkj-admin/src/main/resources/application.yml | 20 +++++-----
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java | 9 ++++
6 files changed, 46 insertions(+), 18 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
index 3007a46..767bb19 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
+++ b/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);
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
index 6b179a0..56c4b2d 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
+++ b/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,15 +593,20 @@
}
}
}
- 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());
- tjProjectList.add(project);
+ 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);
diff --git a/ltkj-admin/src/main/resources/application.yml b/ltkj-admin/src/main/resources/application.yml
index 9137db1..458d8fc 100644
--- a/ltkj-admin/src/main/resources/application.yml
+++ b/ltkj-admin/src/main/resources/application.yml
@@ -11,8 +11,8 @@
# 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ltkj/uploadPath锛孡inux閰嶇疆 /home/ltkj/uploadPath锛�
# 鐢ㄦ埛鎹㈠ご鍍忓悗鐨勫浘鐗囧瓨鍌ㄥ湴鍧� 娴嬭瘯锛欴:\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/
# 寰俊灏忕▼搴廰ppid 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
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java
index 6c60a6c..6cfa9ed 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java
+++ b/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);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java
index 2ef8bbd..c578f68 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java
+++ b/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);
+
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java
index 24cb385..46018da 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java
+++ b/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;
}
+
+
+
+
}
--
Gitblit v1.8.0