From 14ecea8537d5b29ca64c75aad4ff49265018415d Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 02 七月 2025 08:51:22 +0800
Subject: [PATCH] zjh20250702
---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java | 2 +-
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java | 2 +-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 1 +
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 5 +----
ltkj-hosp/src/main/resources/mapper/TjProjectMapper.xml | 2 ++
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 7 ++++---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java | 27 ++++++++++++++++++---------
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java | 2 +-
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java | 4 ++--
ltkj-hosp/src/main/resources/mapper/LtkjJianchajianyanTreeMapper.xml | 8 ++++++++
10 files changed, 39 insertions(+), 21 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
index fd78485..a7c993f 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
@@ -1817,7 +1817,7 @@
//鍒ゆ柇璇ラ」鐩槸鍚﹂渶瑕佹墦鍗版姤鍛�
if (null != one11 && "Y".equals(one11.getNeedReport())) {
TjOrderRemark orderRemark = entry.getKey();
- List<TjPdfVO> value = entry.getValue();
+ List<TjPdfVO> value = entry.getValue().stream().distinct().collect(Collectors.toList());
if (StrUtil.isBlank(value.get(0).getProResult()) && (StrUtil.isBlank(value.get(0).getTs()) && StrUtil.isBlank(value.get(0).getSj()))) {
continue;
}
@@ -2602,12 +2602,13 @@
TjProject tjProject = projectService.getById(tjOrderDetail.getProId());
if (null != tjProject && tjProject.getNeedReport().equals("Y")) {
tjOrderDetail.setProject(tjProject);
+ TjProject tjProjectq = projectService.getById(tjOrderDetail.getProject().getProParentId());
if (tjOrderDetail.getProject().getProParentId().equals(entry.getKey().getProId())
&& entry.getKey().getType() == 1
- && !ids.contains(String.valueOf(tjOrderDetail.getProject().getProParentId()))) {
+ && (!ids.contains(String.valueOf(tjOrderDetail.getProject().getProParentId())) &&
+ !ids.contains(tjProjectq.getHisXmbm()))) {
- TjProject tjProjectq = projectService.getById(tjOrderDetail.getProject().getProParentId());
TjPdfVO tjPdfVO = new TjPdfVO();
tjPdfVO.setProName(tjOrderDetail.getProject().getProName());
tjPdfVO.setProResult(tjOrderDetail.getProResult());
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
index 677fa58..cc0e4dd 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -861,6 +861,7 @@
if (Integer.parseInt(queryPay.get("code").toString()) == 200) {
int sfsf = ltkjJianchajianyanTreeService.getSfsfByCardId(tjOrder.getCardId());
int sfsf1 = ltkjJianchajianyanTreeService.getCallSfsfByCardId(tjOrder.getCardId());
+ log.info("瀛樺偍杩囩▼杩斿洖鐨勬槸: " + sfsf1 + " 浠ｇ爜杩斿洖鐨勬槸 " + sfsf);
if (sfsf > 0 || sfsf1 > 0) {
log.error("璺嘲绉戞妧--- " + DateUtil.date() + " 瀛樺湪鏈即璐归」鐩殑 灏卞崟鏁� " + sfsf);
log.error("璺嘲绉戞妧--- " + DateUtil.date() + " 瀛樺湪鏈即璐归」鐩殑 灏辫瘖鍙� " + tjOrder.getCardId() + " 浣撴鍙� " + tjOrder.getTjNumber());
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index 6b5d836..5222178 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -3414,13 +3414,10 @@
}
}
boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order, lisApiMethod.isUseLisAndPacsRegister(order));
- if (zfHisApiMethods) {
- return AjaxResult.success("鎾ら攢鎴愬姛");
- } else {
+ if (!zfHisApiMethods) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return AjaxResult.error("鎾ら攢澶辫触,璋冪敤浣滃簾鍑虹幇澶辫触");
}
-
}
tjCustomer.setCardId("0");
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
index f1b3506..5447473 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
@@ -18,6 +18,7 @@
import com.ltkj.hosp.mapper.TestMapper;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.treeUtil.TreeSelect;
+import com.ltkj.mall.service.IMallKeywordService;
import com.ltkj.system.service.ISysConfigService;
import com.ltkj.system.service.ISysDeptService;
import io.swagger.annotations.Api;
@@ -74,6 +75,8 @@
private TjProjectXgjlService xgjlService;
@Autowired
private TjBzProService bzProService;
+ @Autowired
+ private IMallKeywordService mallKeywordService;
@GetMapping("/getTjHyBgList")
@@ -95,7 +98,7 @@
List<TjProject> tjProjects = tjProjectService.getDxTjProjectList();
String config = configService.selectConfigByKey("tj_dxsxtj");
if (null != config && config.equals("N")) {
- tjProjects = tjProjectService.getOpenDxTjProjectList(null);
+ tjProjects = tjProjectService.getOpenDxTjProjectList(null, null);
}
if (tjProjects != null) {
for (TjProject project : tjProjects) {
@@ -361,10 +364,11 @@
return AjaxResult.error("璇ラ」鐩鍦ㄥ椁愪腑浣跨敤,鏆傛椂涓嶈兘鍋滅敤");
}
if(tjProject.getProParentId() !=0){
- LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
- wq.eq(TjProject::getProParentId, tjProject.getProParentId());
- wq.eq(TjProject::getProStatus,0);
- List<TjProject> list = tjProjectService.list(wq);
+// LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
+// wq.eq(TjProject::getProParentId, tjProject.getProParentId());
+// wq.eq(TjProject::getProStatus,0);
+// List<TjProject> list = tjProjectService.list(wq);
+ List<TjProject> list = tjProjectService.getTjProjectListBySoneId(tjProject.getProParentId().toString());
if (null != list && !list.isEmpty()) {
int i = list.size();
if(i<2) return AjaxResult.error("鑷冲皯淇濈暀涓�涓瓙椤圭洰,涓嶅彲鍏ㄩ儴鍋滅敤!!!");
@@ -589,11 +593,11 @@
*/
@GetMapping("/getProParentIdDxList")
@ApiOperation(value = "閫夋嫨浣撴椤圭洰(鎵�鏈夐〉闈㈤」鐩�)閫夊崟椤规椂璋冪敤鐨勬帴鍙�")
- public AjaxResult getProParentIdDxList() {
+ public AjaxResult getProParentIdDxList(String xb) {
List<TjProject> tjProjects = tjProjectService.getDxTjProjectList();
String config = configService.selectConfigByKey("tj_dxsxtj");
if (null != config && config.equals("N")) {
- tjProjects = tjProjectService.getOpenDxTjProjectList(null);
+ tjProjects = tjProjectService.getOpenDxTjProjectList(null, xb);
}
String key = configService.selectConfigByKey("is_open_sfxm");
Map<String, Object> map = new HashMap<>();
@@ -606,11 +610,16 @@
@GetMapping("/getProParentIdDxListByFenYe")
@ApiOperation(value = "閫夋嫨浣撴椤圭洰(鎵�鏈夐〉闈㈤」鐩�)閫夊崟椤规椂璋冪敤鐨勬帴鍙�(鏈夊垎椤�)")
- public AjaxResult getProParentIdDxListByFenYe(@RequestParam(defaultValue = "1") int page,@RequestParam(defaultValue = "10") int pageSize,String nr) {
+ public AjaxResult getProParentIdDxListByFenYe(@RequestParam(defaultValue = "1") int page,@RequestParam(defaultValue = "10") int pageSize,String nr,String xb) {
List<TjProject> tjProjects = tjProjectService.getDxTjProjectList();
String config = configService.selectConfigByKey("tj_dxsxtj");
+ if(StringUtil.isNotBlank(xb)){
+ if(xb.contains("4"))xb="0";
+ if(xb.contains("5"))xb="1";
+ if(xb.contains("4") && xb.contains("5"))xb=null;
+ }
if (null != config && config.equals("N")) {
- tjProjects = tjProjectService.getOpenDxTjProjectList(nr);
+ tjProjects = tjProjectService.getOpenDxTjProjectList(nr,xb);
}
String key = configService.selectConfigByKey("is_open_sfxm");
Map<String, Object> map = new HashMap<>();
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
index 030a92d..789d03b 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
@@ -208,7 +208,7 @@
"FROM `tj_order_detail` \n" +
"where order_id=#{orderId}\n" +
"and pro_id IN\n" +
- "(select pro_id from tj_project where pro_parent_id=#{proParentId})")
+ "(select pro_id from tj_project where pro_parent_id=#{proParentId} and deleted=0 and pro_status=0)")
public List<TjOrderDetail> getDetailByOrderIdAndParId(@Param("orderId")Long orderId,@Param("proParentId")Long proParentId);
public List<TjOrderDetail> getDetailByOrderIdAndParIds(@Param("orderId")Long orderId,@Param("proParentIds")List<Long> proParentIds);
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 294788c..fa3bf82 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
@@ -144,7 +144,7 @@
List<TjProject> getDxTjProjectList();
// @Select("SELECT * FROM `tj_project` where pro_parent_id=0 and pro_status=0 and deleted=0")
- List<TjProject> getOpenDxTjProjectList(String nr);
+ List<TjProject> getOpenDxTjProjectList(@Param(value = "nr")String nr,@Param(value = "xb")String xb);
@Select("SELECT a.*,GROUP_CONCAT(b.pro_name ORDER BY b.pro_name) AS all_son_pro_name FROM\n" +
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 fc5f135..ae2079a 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
@@ -111,7 +111,7 @@
List<TjProject> getTjProjectList();
List<TjProject> getDxTjProjectList();
- List<TjProject> getOpenDxTjProjectList(String nr);
+ List<TjProject> getOpenDxTjProjectList(String nr,String xb);
List<TjProject> getPacTjProjectList();
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 c2fddfb..4f4feb2 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
@@ -215,8 +215,8 @@
}
@Override
- public List<TjProject> getOpenDxTjProjectList(String nr) {
- return tjProjectMapper.getOpenDxTjProjectList(nr);
+ public List<TjProject> getOpenDxTjProjectList(String nr,String xb) {
+ return tjProjectMapper.getOpenDxTjProjectList(nr,xb);
}
@Override
diff --git a/ltkj-hosp/src/main/resources/mapper/LtkjJianchajianyanTreeMapper.xml b/ltkj-hosp/src/main/resources/mapper/LtkjJianchajianyanTreeMapper.xml
index c814e6f..2053732 100644
--- a/ltkj-hosp/src/main/resources/mapper/LtkjJianchajianyanTreeMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/LtkjJianchajianyanTreeMapper.xml
@@ -22,4 +22,12 @@
sqdh,tj_price,fyhj,
xmfl,type,pationId,service
</sql>
+
+
+ <select id="getCallSfsfByCardId" parameterType="java.util.Map" statementType="CALLABLE">
+ {call getSfsfByCardId(
+ #{cardId,mode=IN,jdbcType=VARCHAR},
+ #{sl,mode=OUT,jdbcType=INTEGER}
+ )}
+ </select>
</mapper>
diff --git a/ltkj-hosp/src/main/resources/mapper/TjProjectMapper.xml b/ltkj-hosp/src/main/resources/mapper/TjProjectMapper.xml
index 50e8ee1..5daa217 100644
--- a/ltkj-hosp/src/main/resources/mapper/TjProjectMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/TjProjectMapper.xml
@@ -237,6 +237,8 @@
pro_parent_id=0 and pro_status=0 and deleted=0
<if test="nr != null ">and (pro_name like concat('%', #{nr}, '%')
or pro_eng_name like concat('%', #{nr}, '%'))</if>
+ <if test="null !=xb and xb !='' ">
+ and pro_sex=#{xb} and isnull(pro_sex) </if>
</where>
--
Gitblit v1.8.0