From f2162e182405184e14bfa8d628150ccc49318fc3 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期一, 19 五月 2025 17:11:54 +0800
Subject: [PATCH] 总检页面增加体检类型搜索调整了存储过程
---
ltkj-admin/src/main/resources/sql/index.sql | 18 ++++++++++++++++++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java | 3 ++-
ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml | 1 +
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 15 ++++++++++++---
ltkj-admin/src/main/resources/sql/职业病.sql | 14 ++++++++++++++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java | 2 +-
6 files changed, 48 insertions(+), 5 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index 4526fe5..81c1514 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -1042,7 +1042,8 @@
@ApiParam(value = "鍗曚綅") @RequestParam(required = false) Long compId,
@ApiParam(value = "濮撳悕)") @RequestParam(required = false) String name,
@ApiParam(value = "寮�濮嬫椂闂�") @RequestParam(required = false) String beginTime,
- @ApiParam(value = "缁撴潫鏃堕棿") @RequestParam(required = false) String endTime) {
+ @ApiParam(value = "缁撴潫鏃堕棿") @RequestParam(required = false) String endTime,
+ @ApiParam(value = "浣撴绫诲瀷") @RequestParam(required = false) String tjCategory) {
// String config = configService.selectConfigByKey("tj_confirm");
// DateTime beginTimes = null;
// DateTime endTimes = null;
@@ -1139,7 +1140,7 @@
if (name == null) name = "";
if (beginTime == null) beginTime = "";
if (endTime == null) endTime = "";
- return AjaxResult.success(orderService.getCunChuGuoChengCustomerList(tjNumber, page, pageSize, checkStatus, value, beginTime, endTime, name));
+ return AjaxResult.success(orderService.getCunChuGuoChengCustomerList(tjNumber, page, pageSize, checkStatus, value, beginTime, endTime, name,tjCategory));
}
@@ -1266,7 +1267,9 @@
// @PreAuthorize("@ss.hasPermi('check:check:getTjdetailList')")
public AjaxResult getTjdetailList(@ApiParam(value = "浣撴tjNumber") @RequestParam String tjNumber,
@ApiParam(value = "鎬绘寤鸿") @RequestParam(required = false) String advice,
- @ApiParam(value = "瀹℃牳鐘舵��0寰呭鏍�1宸插鏍�") @RequestParam Integer checkStatus) {
+ @ApiParam(value = "瀹℃牳鐘舵��0寰呭鏍�1宸插鏍�") @RequestParam Integer checkStatus,
+ @ApiParam(value = "鑱屼笟缁撹") @RequestParam(required = false) String zhiyeJl,
+ @ApiParam(value = "鑱屼笟缁撴灉") @RequestParam(required = false) String zhiyeJg) {
String config = configService.selectConfigByKey("sfjcwjhyqxm");
if (null != config && config.equalsIgnoreCase("Y")) {
@@ -1288,6 +1291,10 @@
tjOrder.setCheckTime(date);
tjOrder.setStatus(401);
tjOrder.setFinishTime(date);
+ if (StrUtil.isNotBlank(zhiyeJl))
+ tjOrder.setZhiyeJl(zhiyeJl);
+ if (StrUtil.isNotBlank(zhiyeJg))
+ tjOrder.setZhiyeJg(zhiyeJg);
if (orderService.updateById(tjOrder)) {
TjCustomer customer = customerService.getById(tjOrder.getUserId());
if (null != customer) {
@@ -1537,6 +1544,8 @@
parent.put("parentId", remark.getProsId());
parent.put("xmlb", remark.getXmlb());
parent.put("", remark.getXmlb());
+ parent.put("zhiyejl",one.getZhiyeJl());
+ parent.put("zhiyejg", one.getZhiyeJg());
List<TjOrderDetail> dels = new ArrayList<>();
if (null != tjOrderDetails && !tjOrderDetails.isEmpty()) {
for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
diff --git a/ltkj-admin/src/main/resources/sql/index.sql b/ltkj-admin/src/main/resources/sql/index.sql
index 04eaf6b..689cc2b 100644
--- a/ltkj-admin/src/main/resources/sql/index.sql
+++ b/ltkj-admin/src/main/resources/sql/index.sql
@@ -17,3 +17,21 @@
# 鏌ョ湅鏈�澶х殑杩炴帴鏁�
SHOW VARIABLES LIKE 'max_connections';
+
+CREATE TABLE tj_report_special_project (
+ id BIGINT PRIMARY KEY NOT NULL,
+ pro_id BIGINT NOT NULL UNIQUE,
+ template_key TINYINT(2) NOT NULL COMMENT '妯℃澘鍒ゆ柇缂栧彿 鏍规嵁缂栧彿璧颁笉鍚岀殑鐢熸垚妯℃澘绫诲瀷',
+ params TEXT NULL COMMENT '闇�瑕侀澶栦紶閫掔殑鍙傛暟'
+) COMMENT '鎶ュ憡鐗规畩椤圭洰';
+
+
+-- 鍑屼簯鏁版嵁
+INSERT INTO tj_report_special_project VALUES(1623853479200546816,1862852701533012001,1,'{"dy":"4.0","xy":"4.0","title":"闃虫�у弬鑰冨�硷細","dystr":"DOB鍊硷細 鈮� ${dy} HP-闃虫��","xystr":" < ${xy} 姝ｅ父","en":"DOB"}');
+
+
+-- 鍘垮尰闄㈡暟鎹�
+INSERT INTO tj_report_special_project VALUES(1623853479200546817,1870371396991955967,1,'{"dy":"100","xy":"100","title":"鍙傝�冨��(DPM)锛�","dystr":"DPM鍊硷細 鈮� ${dy} 闃虫��","xystr":" < ${xy} 闃存��","en":"DPM"}');
+
+
+SELECT * FROM tj_report_special_project;
diff --git "a/ltkj-admin/src/main/resources/sql/\350\201\214\344\270\232\347\227\205.sql" "b/ltkj-admin/src/main/resources/sql/\350\201\214\344\270\232\347\227\205.sql"
index f526cda..7bbf4c6 100644
--- "a/ltkj-admin/src/main/resources/sql/\350\201\214\344\270\232\347\227\205.sql"
+++ "b/ltkj-admin/src/main/resources/sql/\350\201\214\344\270\232\347\227\205.sql"
@@ -20,4 +20,18 @@
ALTER TABLE tj_order ADD COLUMN zhiye_jl VARCHAR(255) NULL COMMENT '鑱屼笟缁撹';
ALTER TABLE tj_order ADD COLUMN zhiye_jg VARCHAR(255) NULL COMMENT '鑱屼笟缁撴灉';
+# 瀛樺偍杩囩▼淇敼
+# tj_check_list
+# 澧炲姞鍙傛暟浠ュ強鏈�缁堢粨鏋滈泦杩斿洖澧炲姞鏉′欢
+# 鍦∣UT鍙傛暟鍓嶅鍔狅細
+IN p_tjCategory VARCHAR(100)
+# 鏈�缁堣繑鍥炴潯浠舵煡璇�
+-- 璁＄畻鎬昏鏁�
+select count(tjNumber) into total from ls_check_list WHERE (p_tjCategory IS NULL OR tjCategory = p_tjCategory);
+-- 鎵ц鍒嗛〉鏌ヨ骞惰繑鍥炵粨鏋滈泦
+if checkStatus =0 THEN
+select * from ls_check_list WHERE (p_tjCategory IS NULL OR tjCategory = p_tjCategory) ORDER BY finishTime DESC LIMIT page,pageSize;
+ELSE
+select * from ls_check_list WHERE (p_tjCategory IS NULL OR tjCategory = p_tjCategory) ORDER BY shsj DESC LIMIT page,pageSize;
+END if;
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
index d6a85fa..79be679 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
@@ -126,7 +126,7 @@
//瀛樺偍杩囩▼涓撶敤鎺ュ彛(鎬绘)
Map<String,Object> getCunChuGuoChengCustomerList(String tjNumber,Integer page,Integer pageSize,
- Integer checkStatus, String compId, String beginTime, String endTime,String tjname);
+ Integer checkStatus, String compId, String beginTime, String endTime,String tjname,String tjCategory);
//瀛樺偍杩囩▼涓撶敤鎺ュ彛(鍒濆)
Map<String,Object> getCsCunChuGuoChengCustomerList(String tjNumber,Integer page,Integer pageSize,
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
index 6fa622e..64f2e54 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
@@ -226,7 +226,7 @@
@Override
public Map<String,Object> getCunChuGuoChengCustomerList(String tjNumber, Integer page, Integer pageSize, Integer checkStatus,
- String compId, String beginTime, String endTime, String tjname) {
+ String compId, String beginTime, String endTime, String tjname,String tjCategory) {
Map<String, Object> map = new HashMap<>();
map.put("checkStatus",checkStatus);
@@ -237,6 +237,7 @@
map.put("tjname",tjname);
map.put("beginTime",beginTime);
map.put("endTime",endTime);
+ map.put("p_tjCategory",tjCategory);
List<List<?>> list = tjOrderMapper.getCunChuGuoChengCustomerList(map);
Map<String,Object> map1=new HashMap<>();
map1.put("customers",list);
diff --git a/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml b/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml
index 2c7c22d..8fce5c6 100644
--- a/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml
@@ -364,6 +364,7 @@
#{tjname,mode=IN,jdbcType=VARCHAR},
#{beginTime,mode=IN,jdbcType=VARCHAR},
#{endTime,mode=IN,jdbcType=VARCHAR},
+ #{p_tjCategory,mode=IN,jdbcType=VARCHAR},
#{total,mode=OUT,jdbcType=INTEGER}
)}
</select>
--
Gitblit v1.8.0