From f6648a3310debd65648f0dc23c4c58a6a68622c0 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 12 十二月 2024 15:17:13 +0800
Subject: [PATCH] zjh202412012
---
ltkj-framework/src/main/java/com/ltkj/framework/config/SecurityConfig.java | 2 +-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 49 ++++++++++++++++++++++++++++++-------------------
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderRemark.java | 4 ++++
3 files changed, 35 insertions(+), 20 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 4b3b8d6..10cb722 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
@@ -124,26 +124,20 @@
private ITjRulesService rulesService;
-// public void csdsrw() throws InterruptedException {
-// log.info("瀹氭椂浠诲姟寮�濮嬫墽琛�"+new Date());
-// Thread.sleep(1000*5);
-// log.info("瀹氭椂浠诲姟缁撴潫鎵ц"+new Date());
-// }
+ @GetMapping ("/ceshicc")
+ @ApiOperation (value = "娴嬭瘯璋冪敤瀛樺偍杩囩▼鑰楁椂鎺ュ彛")
+ @RepeatSubmit
+// @Transactional
+ public AjaxResult ceshicc(String s) {
- @GetMapping ("/getOperationPermissionsByTjNum")
- @ApiOperation (value = "(鍒濆椤甸潰 鍜� 鍖荤敓椤甸潰)鏍规嵁浣撴鍙疯幏鍙栨槸鍚﹀彲鎿嶄綔鏉冮檺鎺ュ彛 true鍙搷浣� 鍙嶄箣涓嶅彲")
- public AjaxResult getOperationPermissionsByTjNum(@ApiParam (value = "浣撴鍙�") @RequestParam String tjNumber) {
- TjOrder order = orderService.getOrderByTjNum(tjNumber);
- if (null != order) {
- Integer status = order.getStatus();
- if (status < 300) {
- return AjaxResult.success(true);
- }
- if (status > 300) {
- return AjaxResult.success(false);
- }
- }
- return AjaxResult.success(false);
+ long start = System.currentTimeMillis();
+ Map<String,Object> map=new HashMap<>();
+ map.put("tjnum", s);
+ testMapper.tjUpdateDetatilByVi(map);
+
+ long end = System.currentTimeMillis();
+ log.info("鍚屾缁撴潫 鑰楁椂锛歿}绉�", (end - start) / 1000);
+ return AjaxResult.success((end - start) / 1000);
}
@@ -173,6 +167,22 @@
log.info(list1.toString());
return AjaxResult.success(ccXZxYyPacsJgSt);
+ }
+
+ @GetMapping ("/getOperationPermissionsByTjNum")
+ @ApiOperation (value = "(鍒濆椤甸潰 鍜� 鍖荤敓椤甸潰)鏍规嵁浣撴鍙疯幏鍙栨槸鍚﹀彲鎿嶄綔鏉冮檺鎺ュ彛 true鍙搷浣� 鍙嶄箣涓嶅彲")
+ public AjaxResult getOperationPermissionsByTjNum(@ApiParam (value = "浣撴鍙�") @RequestParam String tjNumber) {
+ TjOrder order = orderService.getOrderByTjNum(tjNumber);
+ if (null != order) {
+ Integer status = order.getStatus();
+ if (status < 300) {
+ return AjaxResult.success(true);
+ }
+ if (status > 300) {
+ return AjaxResult.success(false);
+ }
+ }
+ return AjaxResult.success(false);
}
@@ -1652,6 +1662,7 @@
}
if(!dels.isEmpty()){
parent.put("proName",remark.getProName());
+ parent.put("jyjc",remark.getJyjc());
parent.put("sone",dels);
list.add(parent);
}
diff --git a/ltkj-framework/src/main/java/com/ltkj/framework/config/SecurityConfig.java b/ltkj-framework/src/main/java/com/ltkj/framework/config/SecurityConfig.java
index 2ecf802..f54dab5 100644
--- a/ltkj-framework/src/main/java/com/ltkj/framework/config/SecurityConfig.java
+++ b/ltkj-framework/src/main/java/com/ltkj/framework/config/SecurityConfig.java
@@ -110,7 +110,7 @@
// 瀵逛簬鐧诲綍login 娉ㄥ唽register 楠岃瘉鐮乧aptchaImage 鍏佽鍖垮悕璁块棶
.antMatchers("/login", "/register", "/captchaImage","/cus/**","/getCaptchaConfigKey","/report/jmreport/**",
"/sqlserver/getdata/**","/api/His/**","/system/config/zx","/system/config/gxxmpym","/system/report/savePdf",
- "/system/dyjl/saveGjddyjl","/system/dyjl/saveBlGjddyjl","/check/ceshi","/check/pacs").permitAll()
+ "/system/dyjl/saveGjddyjl","/system/dyjl/saveBlGjddyjl","/check/ceshi","/check/pacs","/check/ceshicc").permitAll()
.antMatchers("/common/uploadImgExe","/common/listExeVal","/pacs/InvokeRisService/**").permitAll()
.antMatchers("/check/dataSynchronizationApi").permitAll()
// 闈欐�佽祫婧愶紝鍙尶鍚嶈闂�
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderRemark.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderRemark.java
index e554d60..6f62445 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderRemark.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderRemark.java
@@ -130,6 +130,10 @@
@TableField(exist = false)
private String jgbx;
+ @TableField(exist = false)
+// 0妫�楠� 1妫�鏌�
+ private String jyjc;
+
@Override
public String toString() {
--
Gitblit v1.8.0