From 7e622820bca4011788ed676e9a2af74a7b0d0e7d Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期三, 04 六月 2025 17:36:20 +0800
Subject: [PATCH] 查报告增加时间范围以及配置
---
ltkj-hosp/src/main/resources/mapper/TjCustomerMapper.xml | 1 +
ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java | 20 ++++++++++++++++++--
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCustomerMapper.java | 3 ++-
ltkj-admin/src/main/resources/1.js | 7 +++++++
ltkj-admin/src/main/resources/sql/职业病.sql | 11 +++++++++++
5 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java
index a1d532e..b6e6a79 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java
@@ -12,6 +12,7 @@
import com.ltkj.hosp.service.ITjOrderDetailService;
import com.ltkj.hosp.service.ITjOrderService;
import com.ltkj.hosp.vodomain.ShenGaoTiZhongVo;
+import com.ltkj.system.service.ISysConfigService;
import com.ltkj.web.controller.system.TjCheckController;
import com.ltkj.web.controller.system.TjReportController;
import io.swagger.annotations.ApiOperation;
@@ -22,7 +23,10 @@
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.IOException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -47,6 +51,8 @@
private ITjOrderService tjOrderService;
@Autowired
private ITjOrderDetailService detailService;
+ @Autowired
+ private ISysConfigService sysConfigService;
/**
* 鎻愪緵缁欎笁鏂硅皟鐢ㄧ殑鎶ュ憡鏌ョ湅鎺ュ彛
@@ -115,8 +121,18 @@
JSONObject entries = JSONUtil.parseObj(json);
String card = entries.getStr("card");
// TjCustomer customer = tjCustomerMapper.getCusInfo(card);
- List<Map<String ,Object>> customer = tjCustomerMapper.getCusInfoList(card);
- return AjaxResult.success(customer);
+ String key = sysConfigService.selectConfigByKey("h5OrXcxQueryDate");
+ if (StrUtil.isBlank(key)){
+ key = "2025-05-01";
+ }
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ try {
+ Date date = sdf.parse(key);
+ List<Map<String ,Object>> customer = tjCustomerMapper.getCusInfoList(card,date);
+ return AjaxResult.success(customer);
+ } catch (ParseException e) {
+ return AjaxResult.error();
+ }
}
/**
diff --git a/ltkj-admin/src/main/resources/1.js b/ltkj-admin/src/main/resources/1.js
index 7215d8c..f2eca44 100644
--- a/ltkj-admin/src/main/resources/1.js
+++ b/ltkj-admin/src/main/resources/1.js
@@ -226,3 +226,10 @@
left join tj_order b on b.card_id = a.card_id join tj_customer c on c.cus_id = b.user_id
left join sys_attachment d on d.old_file_name<>concat(c.cus_name,'_',a.id,'.jpg')
where a.his_xmdm in ('8522','gmd');
+
+-- 鐥呯缁熻鎶ヨ〃
+INSERT INTO `jimu_report` (`id`, `code`, `name`, `note`, `status`, `type`, `json_str`, `api_url`, `thumb`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `api_method`, `api_code`, `template`, `view_count`, `css_str`, `js_str`, `tenant_id`, `print_type`, `is_start`, `create_id`, `update_id`) VALUES ('1042322631512850432', '20250123163821', '鐥呯缁熻', NULL, NULL, 'datainfo', '{\"loopBlockList\":[],\"area\":{\"sri\":3,\"sci\":1,\"eri\":3,\"eci\":1,\"width\":250,\"height\":40},\"excel_config_id\":\"1042322631512850432\",\"printConfig\":{\"paper\":\"A4\",\"width\":210,\"height\":297,\"definition\":1,\"isBackend\":false,\"marginX\":10,\"marginY\":10,\"layout\":\"portrait\",\"printCallBackUrl\":\"\"},\"zonedEditionList\":[],\"rows\":{\"0\":{\"cells\":{\"0\":{\"merge\":[1,6],\"height\":50,\"text\":\"鐥呯缁熻\",\"style\":1}}},\"1\":{\"cells\":{}},\"2\":{\"cells\":{\"0\":{\"style\":7,\"text\":\" 椤圭洰\"},\"1\":{\"style\":8,\"text\":\" 寮傚父椤圭洰\",\"rendered\":\"\",\"config\":\"\"},\"2\":{\"style\":8,\"text\":\" 闃虫�т汉鏁癨"},\"3\":{\"style\":8,\"text\":\"闃存�т汉鏁� \"},\"4\":{\"style\":8,\"text\":\"鎬绘鏌ヤ汉鏁癨"},\"5\":{\"style\":8,\"text\":\" 姝ｅ父鐜嘰"}}},\"3\":{\"cells\":{\"0\":{\"style\":11,\"text\":\"#{data.group(pro_name)}\",\"aggregate\":\"group\",\"rendered\":\"\",\"config\":\"\"},\"1\":{\"style\":11,\"text\":\"#{data.temp_result}\",\"aggregate\":\"select\",\"rendered\":\"\",\"config\":\"\",\"display\":\"normal\"},\"2\":{\"style\":12,\"text\":\"#{data.yangxing}\",\"rendered\":\"\",\"config\":\"\"},\"3\":{\"style\":12,\"text\":\"#{data.yinxing}\"},\"4\":{\"style\":12,\"text\":\"#{data.person_count}\"},\"5\":{\"style\":13,\"text\":\"#{data.zcl}\",\"decimalPlaces\":\"2\"}},\"height\":40},\"5\":{\"cells\":{\"0\":{\"style\":10,\"text\":\" \"},\"1\":{\"style\":10,\"text\":\" \",\"rendered\":\"\",\"config\":\"\"},\"2\":{\"style\":10,\"text\":\" \"},\"3\":{\"style\":10,\"text\":\" \"},\"4\":{\"style\":10,\"text\":\" \"},\"5\":{\"style\":10,\"text\":\" \"}}},\"6\":{\"cells\":{\"0\":{\"style\":10,\"text\":\" \"},\"1\":{\"style\":10,\"text\":\" \"},\"2\":{\"style\":10,\"text\":\" \"},\"3\":{\"style\":10,\"text\":\" \"},\"4\":{\"style\":10,\"text\":\" \"},\"5\":{\"style\":10,\"text\":\" \"}}},\"len\":99},\"dbexps\":[],\"dicts\":[],\"rpbar\":{\"show\":true,\"pageSize\":\"\",\"btnList\":[]},\"groupField\":\"data.pro_name\",\"fixedPrintHeadRows\":[],\"fixedPrintTailRows\":[],\"freeze\":\"A1\",\"dataRectWidth\":640,\"displayConfig\":{},\"background\":false,\"name\":\"sheet1\",\"autofilter\":{},\"styles\":[{\"align\":\"center\"},{\"align\":\"center\",\"font\":{\"size\":22}},{\"font\":{\"size\":22}},{\"bgcolor\":\"#deeaf6\"},{\"bgcolor\":\"#deeaf6\",\"border\":{\"bottom\":[\"thin\",\"#000\"],\"top\":[\"thin\",\"#000\"],\"left\":[\"thin\",\"#000\"],\"right\":[\"thin\",\"#000\"]}},{\"border\":{\"bottom\":[\"thin\",\"#000\"],\"top\":[\"thin\",\"#000\"],\"left\":[\"thin\",\"#000\"],\"right\":[\"thin\",\"#000\"]}},{\"bgcolor\":\"#deeaf6\",\"border\":{\"bottom\":[\"thin\",\"#000\"],\"top\":[\"thin\",\"#000\"],\"left\":[\"thin\",\"#000\"],\"right\":[\"thin\",\"#000\"]},\"font\":{\"bold\":true}},{\"bgcolor\":\"#deeaf6\",\"border\":{\"bottom\":[\"thin\",\"#000\"],\"top\":[\"thin\",\"#000\"],\"left\":[\"thin\",\"#000\"],\"right\":[\"thin\",\"#000\"]},\"font\":{\"bold\":true},\"align\":\"center\"},{\"bgcolor\":\"#deeaf6\",\"border\":{\"bottom\":[\"thin\",\"#000\"],\"top\":[\"thin\",\"#000\"],\"left\":[\"thin\",\"#000\"],\"right\":[\"thin\",\"#000\"]},\"align\":\"center\"},{\"border\":{\"bottom\":[\"thin\",\"#000\"],\"top\":[\"thin\",\"#000\"],\"left\":[\"thin\",\"#000\"],\"right\":[\"thin\",\"#000\"]},\"format\":\"number\"},{},{\"border\":{\"bottom\":[\"thin\",\"#000\"],\"top\":[\"thin\",\"#000\"],\"left\":[\"thin\",\"#000\"],\"right\":[\"thin\",\"#000\"]},\"textwrap\":true},{\"border\":{\"bottom\":[\"thin\",\"#000\"],\"top\":[\"thin\",\"#000\"],\"left\":[\"thin\",\"#000\"],\"right\":[\"thin\",\"#000\"]},\"align\":\"center\"},{\"border\":{\"bottom\":[\"thin\",\"#000\"],\"top\":[\"thin\",\"#000\"],\"left\":[\"thin\",\"#000\"],\"right\":[\"thin\",\"#000\"]},\"format\":\"number\",\"align\":\"center\"}],\"validations\":[],\"isGroup\":true,\"cols\":{\"1\":{\"width\":250},\"2\":{\"width\":60},\"3\":{\"width\":60},\"4\":{\"width\":70},\"5\":{\"width\":100},\"len\":50},\"merges\":[\"A1:G2\"]}', NULL, NULL, '10001', '2025-01-23 16:38:22', '10001', '2025-05-26 14:45:56', 0, NULL, NULL, 0, 53, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `jimu_report_db` (`id`, `jimu_report_id`, `create_by`, `update_by`, `create_time`, `update_time`, `db_code`, `db_ch_name`, `db_type`, `db_table_name`, `db_dyn_sql`, `db_key`, `tb_db_key`, `tb_db_table_name`, `java_type`, `java_value`, `api_url`, `api_method`, `is_list`, `is_page`, `db_source`, `db_source_type`, `json_data`, `api_convert`, `create_id`, `update_id`) VALUES ('1047054311028981760', '1042322631512850432', '10001', '10001', '2025-05-26 14:45:54', '2025-05-26 14:45:54', 'data', '淇℃伅', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'http://192.168.1.2:5000/report/jmreport/getBingZhong?hospId=ltkjpeis10_jdczgzyy&start=${start}&end=${end}', '0', '1', '0', '', NULL, '', '', NULL, NULL);
+INSERT INTO `jimu_report_db_param` (`id`, `jimu_report_head_id`, `param_name`, `param_txt`, `param_value`, `order_num`, `create_by`, `create_time`, `update_by`, `update_time`, `search_flag`, `widget_type`, `search_mode`, `dict_code`, `search_format`, `ext_json`, `create_id`, `update_id`) VALUES ('1086866920296972288', '1047054311028981760', 'start', '寮�濮嬫椂闂�', '=dateStr(\'yyyy-MM-dd\', -1)', 1, '10001', '2025-05-26 14:45:54', NULL, NULL, 1, 'date', NULL, NULL, 'yyyy-MM-dd HH:mm:ss', '', NULL, NULL);
+INSERT INTO `jimu_report_db_param` (`id`, `jimu_report_head_id`, `param_name`, `param_txt`, `param_value`, `order_num`, `create_by`, `create_time`, `update_by`, `update_time`, `search_flag`, `widget_type`, `search_mode`, `dict_code`, `search_format`, `ext_json`, `create_id`, `update_id`) VALUES ('1086868045213499392', '1047054311028981760', 'end', '缁撴潫鏃堕棿', '=dateStr(\'yyyy-MM-dd 23:59:59\')', 2, '10001', '2025-05-26 14:45:54', NULL, NULL, 1, 'date', NULL, NULL, 'yyyy-MM-dd HH:mm:ss', '', NULL, NULL);
+INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`, `deleted`, `create_id`, `update_id`) VALUES (2403, '鐥呯缁熻', 2035, 60, 'bztj', 'jmreport/bztj/index', NULL, 1, 0, 'C', '0', '0', NULL, '#', '瓒呯骇绠＄悊鍛�', '2025-05-26 09:43:57', '', NULL, '', 0, NULL, NULL);
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 7bbf4c6..27da69e 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,6 +20,17 @@
ALTER TABLE tj_order ADD COLUMN zhiye_jl VARCHAR(255) NULL COMMENT '鑱屼笟缁撹';
ALTER TABLE tj_order ADD COLUMN zhiye_jg VARCHAR(255) NULL COMMENT '鑱屼笟缁撴灉';
+ALTER TABLE `tj_order`
+ ADD COLUMN `zhiye_gz` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '鑱屼笟宸ョ' AFTER `zhiye_jg`,
+ ADD COLUMN `zhiye_zgln` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '鑱屼笟鎬诲伐榫勫勾' AFTER `zhiye_gz`,
+ ADD COLUMN `zhiye_zgly` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '鎬诲伐榫勬湀' AFTER `zhiye_zgln`,
+ ADD COLUMN `zhiye_jhys` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '鑱屼笟鎺ュ鍥犵礌' AFTER `zhiye_zgly`,
+ ADD COLUMN `zhiye_rzsj` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '鑱屼笟鍏ヨ亴鏃堕棿' AFTER `zhiye_jhys`,
+ ADD COLUMN `zhiye_scdw` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '鑱屼笟鎵�澶勫崟浣�' AFTER `zhiye_rzsj`,
+ ADD COLUMN `zhiye_zysksrq` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '鑱屼笟鍙插紑濮嬫棩鏈�' AFTER `zhiye_scdw`,
+ ADD COLUMN `zhiye_zysjsrq` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '鑱屼笟鍙茬粨鏉熸棩鏈�' AFTER `zhiye_zysksrq`,
+ ADD COLUMN `zhiye_zysszdw` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '鑱屼笟鍙叉墍鍦ㄥ崟浣�' AFTER `zhiye_zysjsrq`;
+
# 瀛樺偍杩囩▼淇敼
# tj_check_list
# 澧炲姞鍙傛暟浠ュ強鏈�缁堢粨鏋滈泦杩斿洖澧炲姞鏉′欢
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCustomerMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCustomerMapper.java
index 5479bac..e2dbf3e 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCustomerMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCustomerMapper.java
@@ -1,6 +1,7 @@
package com.ltkj.hosp.mapper;
import java.sql.ResultSet;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -105,7 +106,7 @@
List<TjCustomer> getcusList(TjCustomer tjCustomer);
- List<Map<String ,Object >> getCusInfoList(String card);
+ List<Map<String ,Object >> getCusInfoList(@Param("card") String card,@Param("time") Date time);
List<Map<String ,Object >> getCusInfoListByCardAndName(@Param("card") String card,@Param("name") String name);
diff --git a/ltkj-hosp/src/main/resources/mapper/TjCustomerMapper.xml b/ltkj-hosp/src/main/resources/mapper/TjCustomerMapper.xml
index 0d64d76..8a63913 100644
--- a/ltkj-hosp/src/main/resources/mapper/TjCustomerMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/TjCustomerMapper.xml
@@ -278,6 +278,7 @@
LEFT JOIN tj_report r ON o.tj_number = r.tj_number
WHERE
c.cus_idcard = #{card}
+ and o.create_time > #{time}
ORDER BY
o.create_time DESC
</select>
--
Gitblit v1.8.0