From 37964f92084e6803a480207846ed292146b0fcf0 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 29 四月 2025 12:41:57 +0800
Subject: [PATCH] zjh20250429
---
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProAdvicerulesServiceImpl.java | 5 +++++
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProAdvicerulesMapper.java | 5 +++++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProAdvicerulesController.java | 8 ++++++++
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java | 7 ++++---
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProject.java | 3 +++
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 14 ++++++++------
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjPdfVO.java | 2 ++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java | 1 +
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProAdvicerulesService.java | 2 ++
9 files changed, 38 insertions(+), 9 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 8c95eaa..44a2ea1 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
@@ -3023,6 +3023,7 @@
}
tjPdfVO.setProId(String.valueOf(tjOrderDetail.getProject().getProId()));
tjPdfVO.setPid(String.valueOf(tjProject.getProParentId()));
+ tjPdfVO.setXh(tjProject.getXh());
// LambdaQueryWrapper<LtkjExamJcbgd> wrapper = new LambdaQueryWrapper<>();
// wrapper.eq(LtkjExamJcbgd::getTjh, tjNumber);
// wrapper.eq(LtkjExamJcbgd::getXmdm, String.valueOf(tjOrderDetail.getProject().getProParentId()));
@@ -3031,12 +3032,13 @@
}
}
if(!tjPdfVOS.isEmpty()){
- tjPdfVOS=tjPdfVOS.stream().sorted(Comparator.comparing(TjPdfVO::getProName, Collator.getInstance(Locale.CHINA))).collect(Collectors.toList());
- tjPdfVOS = tjPdfVOS.stream()
- .sorted(Comparator.comparingInt(
- tjPdfVO -> tjPdfVO.getProName().length() // 鏍规嵁鍚嶅瓧鐨勯暱搴︽帓搴�
- ))
- .collect(Collectors.toList());
+// tjPdfVOS=tjPdfVOS.stream().sorted(Comparator.comparing(TjPdfVO::getProName, Collator.getInstance(Locale.CHINA))).collect(Collectors.toList());
+// tjPdfVOS = tjPdfVOS.stream()
+// .sorted(Comparator.comparingInt(
+// tjPdfVO -> tjPdfVO.getProName().length() // 鏍规嵁鍚嶅瓧鐨勯暱搴︽帓搴�
+// ))
+// .collect(Collectors.toList());
+ tjPdfVOS=tjPdfVOS.stream().sorted(Comparator.comparing(TjPdfVO::getXh)).collect(Collectors.toList());
}
printReport.put(entry.getKey(), tjPdfVOS);
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProAdvicerulesController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProAdvicerulesController.java
index df39707..55ff571 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProAdvicerulesController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProAdvicerulesController.java
@@ -162,4 +162,12 @@
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(tjProAdvicerulesService.deleteTjProAdvicerulesByIds(ids));
}
+
+ @GetMapping("/getTjProAdvicerulesKsList")
+ @ApiOperation(value = "鑾峰彇浣撴璇婃柇寤鸿绉戝鍒楄〃鎺ュ彛")
+ public AjaxResult getTjProAdvicerulesKsList() {
+ List<String> tjProAdvicerulesKsList = tjProAdvicerulesService.getTjProAdvicerulesKsList();
+ return AjaxResult.success(tjProAdvicerulesKsList);
+ }
+
}
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 df245be..c8e5a93 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
@@ -157,6 +157,7 @@
if (checkType != null) {
wq.eq(TjProject::getProCheckType, checkType);
}
+ wq.orderByAsc(TjProject::getXh);
List<TjProject> tjProjects = tjProjectService.list(wq);
// List<TjProject> tjProjects = tjProjectService.getAllChildListById(proId);
if (tjProjects != null) {
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjPdfVO.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjPdfVO.java
index 500d498..87f6de5 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjPdfVO.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjPdfVO.java
@@ -48,4 +48,6 @@
* 纰�13id
*/
private String pid;
+
+ private Integer xh;
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProject.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProject.java
index d5f9e98..a7cd135 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProject.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProject.java
@@ -127,6 +127,9 @@
@ApiModelProperty(value = "椤圭洰鐘舵��")
private Integer proStatus;
+ @ApiModelProperty(value = "澶栭�佹爣蹇楅粯璁ゆ槸0涓嶅閫侊紝1鏄閫� ")
+ private Integer proDelivery;
+
/**
* 濂楅鏄惁鍚湁璇ラ」鐩�
*/
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
index e7809ba..269b983 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
@@ -169,10 +169,11 @@
- @Select("SELECT a.* FROM tj_order_remark a LEFT JOIN sys_dept b ON b.dept_id=a.dept_id LEFT JOIN tj_project c ON c.pro_id=a.pro_id\n" +
- "\n" +
- "WHERE a.deleted=0 AND b.org_type = 3 AND c.need_report='Y' AND a.tj_number=#{tjnumber}")
+// @Select("SELECT a.* FROM tj_order_remark a LEFT JOIN sys_dept b ON b.dept_id=a.dept_id LEFT JOIN tj_project c ON c.pro_id=a.pro_id\n" +
+// "\n" +
+// "WHERE a.deleted=0 AND b.org_type = 3 AND c.need_report='Y' AND a.tj_number=#{tjnumber}")
+ @Select("call notHuaYanData(#{tjnumber,mode=IN})")
List<TjOrderRemark> notHuaYanData(String tjnumber);
@Select("SELECT a.* FROM tj_order_remark a LEFT JOIN sys_dept b ON b.dept_id=a.dept_id LEFT JOIN tj_project c ON c.pro_id=a.pro_id\n" +
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProAdvicerulesMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProAdvicerulesMapper.java
index eeab6c9..e9d7685 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProAdvicerulesMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProAdvicerulesMapper.java
@@ -69,4 +69,9 @@
@Select("call tj_new_advicerules(\n" +
" #{ks,mode=IN,jdbcType=VARCHAR},#{jg,mode=IN,jdbcType=VARCHAR},#{kslx,mode=IN,jdbcType=VARCHAR},#{xb,mode=IN,jdbcType=VARCHAR} )")
Map<String, Object> getyichangxiangmujianyiguizeJianCha(@Param("ks") String ks,@Param("jg") String s,@Param("kslx") String kslx,@Param("xb") String xb);
+
+
+
+ @Select("SELECT a.ks FROM tj_pro_advicerules a WHERE a.deleted=0 GROUP BY a.ks")
+ List<String> getTjProAdvicerulesKsList();
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProAdvicerulesService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProAdvicerulesService.java
index 7bb10c2..d54ef81 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProAdvicerulesService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProAdvicerulesService.java
@@ -62,4 +62,6 @@
public int deleteTjProAdvicerulesById(Long id);
Map<String, Object> getyichangxiangmujianyiguizeJianCha(String ks, String s, String kslx,String xb);
+
+ List<String> getTjProAdvicerulesKsList();
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProAdvicerulesServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProAdvicerulesServiceImpl.java
index 362ad16..ac6eb49 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProAdvicerulesServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProAdvicerulesServiceImpl.java
@@ -95,4 +95,9 @@
public Map<String, Object> getyichangxiangmujianyiguizeJianCha(String ks, String s, String kslx,String xb) {
return tjProAdvicerulesMapper.getyichangxiangmujianyiguizeJianCha(ks,s,kslx,xb);
}
+
+ @Override
+ public List<String> getTjProAdvicerulesKsList() {
+ return tjProAdvicerulesMapper.getTjProAdvicerulesKsList();
+ }
}
--
Gitblit v1.8.0