From b60f30814143a9c61200504cfc783ae6cb66fd6d Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 14 二月 2025 14:53:51 +0800
Subject: [PATCH] zjh20250214
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 29 ++--
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java | 9 +
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java | 7
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 29 ++++
ltkj-admin/src/main/resources/application-win-chkwyytest.yaml | 255 ++++++++++++++++++++++++++++++++++++++++++
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java | 4
6 files changed, 313 insertions(+), 20 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
index 729bdf1..c32194a 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
@@ -8,6 +8,7 @@
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.extra.pinyin.PinyinUtil;
+import cn.hutool.json.JSONUtil;
import com.ltkj.common.core.domain.entity.SysMenu;
import com.ltkj.common.utils.SecurityUtils;
import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
@@ -231,6 +232,7 @@
try {
List<Aws> awsList = testMapper.getWsxmLtkjHysqdByLisViBySLAVEWS(s);
if(null !=awsList && !awsList.isEmpty()){
+ log.info("澶栭�侀」鐩釜鏁�->{} 缁撴灉",awsList.size());
log.info(awsList.toString());
testMapper.delWsxmjg(s);
log.info("鍒犻櫎澶栭�侀」鐩垚鍔�");
@@ -238,9 +240,14 @@
log.info("淇濆瓨澶栭�侀」鐩垚鍔�");
}
List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(s);
+ log.info("鍘焗ysqdList->{} 缁撴灉", JSONUtil.parseObj(hysqdList));
List<LtkjHysqd> wssq = testMapper.getWsxmLtkjHysqdByLisVi(s);
- if(null !=wssq && !wssq.isEmpty())hysqdList.addAll(wssq);
+ if(null !=wssq && !wssq.isEmpty()){
+ log.info("澶栭�侀」涓�->{} 缁撴灉",wssq.toString());
+ hysqdList.addAll(wssq);
+ }
if (null != hysqdList && !hysqdList.isEmpty()) {
+ log.info("鐜癶ysqdList->{} 缁撴灉", JSONUtil.parseObj(hysqdList));
for (LtkjHysqd hysqd : hysqdList) {
LtkjHysqd jybgid = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(hysqd.getTjh(), hysqd.getTmh());
if (null != jybgid) {
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 6461594..c60582c 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
@@ -1085,7 +1085,10 @@
tjOrderService.tjQiandaodengji(tjOrder.getTjNumber());
return result;
}
- } finally {
+ }catch (Exception e){
+ log.error(String.valueOf(e));
+ }
+ finally {
lock.unlock();
}
return AjaxResult.error();
@@ -1347,6 +1350,7 @@
// 鏌ヨ 瀵规帴Lis銆丳acs鐢宠濡傛灉绫诲瀷鍖呭惈鍦ㄩ厤缃唴鍒欎娇鐢ㄥ鎺is銆乸acs
if (lisApiMethod.isUseLisAndPacsRegister(tjOrder)) {
+ log.info("绛惧埌鐧昏杩涘叆鏈敹璐规柟娉�");
// 杩欐槸涓婇潰涓汉鏂规硶寮曞叆鏁版嵁
tjFlowingWater.setPayStasus(1L);
newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
@@ -1356,6 +1360,7 @@
List<TjXdPicture> xdPictureList = xdPictureService.saveTjXdPicture(tjOrder.getTjNumber());
xdPictureService.saveBatch(xdPictureList);
List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
+ log.info("绛惧埌鐧昏:閲囨牱鏁版嵁鏌ヨ涓暟"+detailList.size());
addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
return AjaxResult.success(tjNumber);
} else {
@@ -1525,6 +1530,28 @@
}
+
+ @GetMapping("/addCaiYangDengJi")
+ @ApiOperation(value = "鎵嬪姩娣诲姞閲囨牱璁板綍鎺ュ彛")
+ public AjaxResult addCaiYangDengJi(@RequestParam("tjNum") String tjNum){
+
+ try {
+ TjOrder order = tjOrderService.getOrderByTjNum(tjNum);
+ if(null !=order){
+ Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
+ SysUser sysUser = userService.getById(userId);
+ List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(order.getOrderId());
+ log.info("绛惧埌鐧昏:閲囨牱鏁版嵁鏌ヨ涓暟"+detailList.size());
+ addCaiYangDengJi(detailList, !detailList.isEmpty(), order, sysUser, null);
+ }
+ } catch (NumberFormatException e) {
+ log.error(String.valueOf(e));
+ }
+
+ return AjaxResult.success();
+ }
+
+
@PostMapping("/addPlOrderAndDetail")
@ApiOperation(value = "浣撴鎵归噺绛惧埌鐧昏鎺ュ彛")
// @Transactional //(鍒囨崲鏁版嵁搴撳嚭閿欙紝鎵�浠ユ敞閲�)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
index 8d63e5b..297605a 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
@@ -2139,20 +2139,8 @@
@GetMapping("/revocationReport/{TjNumber}")
@ApiOperation(value = "鎾ら攢鐢熸垚浣撴鎶ュ憡")
+ @Transactional
public AjaxResult revocationReport(@PathVariable("TjNumber") String tjNumber) {
- //閫昏緫鍒犻櫎鏁版嵁搴撻噷鐨勬姤鍛�
- QueryWrapper<TjReport> wq1 = new QueryWrapper<>();
- wq1.select("re_id");
- wq1.eq("tj_number", tjNumber);
- wq1.eq("type", "浣撴鎶ュ憡");
- TjReport tjReport = tjReportService.getOne(wq1);
- if (null != tjReport) {
- // 涓嶅湪浣跨敤閫昏緫鍒犻櫎 閫昏緫鍒犻櫎瀵艰嚧鎵撳嵃鎶ュ憡鐢熸垚 鏌ヨsql缂撴參
- int i = tjReportService.deleteTjReportByReId(tjReport.getReId());
- if (i == 0) {
- return AjaxResult.error("鏆傛棤浣撴鎶ュ憡,璇锋挙鍥炲埌鎬绘鏈鏍搁〉闈�,闇�鎬绘鍖荤敓閲嶆柊瀹℃牳骞剁敓鎴愭姤鍛�!");
- }
- }
TjOrder one = tjOrderService.getOrderByTjNum(tjNumber);
if(null !=one){
@@ -2173,6 +2161,21 @@
one.setPrintLastTime(null);
one.setDownloadLastTime(null);
if (tjOrderService.updateById(one)) {
+
+ //閫昏緫鍒犻櫎鏁版嵁搴撻噷鐨勬姤鍛�
+ QueryWrapper<TjReport> wq1 = new QueryWrapper<>();
+ wq1.select("re_id");
+ wq1.eq("tj_number", tjNumber);
+ wq1.eq("type", "浣撴鎶ュ憡");
+ TjReport tjReport = tjReportService.getOne(wq1);
+ if (null != tjReport) {
+ // 涓嶅湪浣跨敤閫昏緫鍒犻櫎 閫昏緫鍒犻櫎瀵艰嚧鎵撳嵃鎶ュ憡鐢熸垚 鏌ヨsql缂撴參
+ int i = tjReportService.deleteTjReportByReId(tjReport.getReId());
+ if (i == 0) {
+ return AjaxResult.error("鏆傛棤浣撴鎶ュ憡,璇锋挙鍥炲埌鎬绘鏈鏍搁〉闈�,闇�鎬绘鍖荤敓閲嶆柊瀹℃牳骞剁敓鎴愭姤鍛�!");
+ }
+ }
+
return AjaxResult.success("鎾ゅ洖鎴愬姛锛�");
}
}
diff --git a/ltkj-admin/src/main/resources/application-win-chkwyytest.yaml b/ltkj-admin/src/main/resources/application-win-chkwyytest.yaml
new file mode 100644
index 0000000..9c2aa97
--- /dev/null
+++ b/ltkj-admin/src/main/resources/application-win-chkwyytest.yaml
@@ -0,0 +1,255 @@
+# 椤圭洰鐩稿叧閰嶇疆
+ltkj:
+ # 鍚嶇О
+ name: ltkj
+ # 鐗堟湰
+ version: 1.0.1
+ # 鐗堟潈骞翠唤
+ copyrightYear: 2022
+ # 瀹炰緥婕旂ず寮�鍏�
+ demoEnabled: true
+ # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ltkj/uploadPath锛孡inux閰嶇疆 /home/ltkj/uploadPath锛�
+ # 鐢ㄦ埛鎹㈠ご鍍忓悗鐨勫浘鐗囧瓨鍌ㄥ湴鍧� 娴嬭瘯锛欴:\ltkj\uploadPath\avatar\2022\12\14
+ #profile: D:/ltkj/uploadPath
+ # profile: https://ltpeis.xaltjdkj.cn:5502/uploadPath
+ profile: http://192.168.0.5:5502/uploadPath
+
+ # 鑾峰彇ip鍦板潃寮�鍏�
+ addressEnabled: true
+ # 楠岃瘉鐮佺被鍨� math 鏁扮粍璁＄畻 char 瀛楃楠岃瘉
+ captchaType: math
+# 寮�鍙戠幆澧冮厤缃�
+server:
+ # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
+ port: 5002
+ servlet:
+ # 搴旂敤鐨勮闂矾寰�
+ context-path: /ltkj-admin
+ tomcat:
+ # tomcat鐨刄RI缂栫爜
+ uri-encoding: UTF-8
+ # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
+ accept-count: 1000
+ threads:
+ # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
+ max: 800
+ # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
+ min-spare: 100
+
+# 鏃ュ織閰嶇疆
+#logging:
+# level:
+# com.ltkj: debug
+# org.springframework: warn
+
+# 鐢ㄦ埛閰嶇疆
+user:
+ password:
+ # 瀵嗙爜鏈�澶ч敊璇鏁�
+ maxRetryCount: 5
+ # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
+ lockTime: 10
+
+# Spring閰嶇疆
+spring:
+ # 璧勬簮淇℃伅
+ messages:
+ # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
+ basename: i18n/messages
+ # 鏂囦欢涓婁紶
+ servlet:
+ multipart:
+ # 鍗曚釜鏂囦欢澶у皬
+ max-file-size: 2GB
+ # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
+ max-request-size: 2GB
+ # 鏈嶅姟妯″潡
+ devtools:
+ restart:
+ # 鐑儴缃插紑鍏�
+ enabled: true
+ cache:
+ type: redis
+
+ # redis 閰嶇疆
+ # redis:
+ # # 鍦板潃
+ ## host: 101.42.27.146
+ # host: localhost
+ # # 绔彛锛岄粯璁や负6379
+ # port: 6379
+ # # 鏁版嵁搴撶储寮�
+ # database: 0
+ # # 瀵嗙爜
+ ## password: 654321
+ # password: 123456
+ # # 杩炴帴瓒呮椂鏃堕棿
+ # timeout: 120s
+ # lettuce:
+ # pool:
+ # # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
+ # min-idle: 0
+ # # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
+ # max-idle: 8
+ # # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
+ # max-active: 8
+ # # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
+ # max-wait: -1ms
+ # 閭欢
+ mail:
+ # from 瑕佸拰 username 涓�鑷�, 鍚﹀垯鎶ラ敊
+ from: 1138758025@qq.com
+ # 閭欢鏈嶅姟鍦板潃
+ host: smtp.qq.com
+ # 鐢ㄦ埛鍚�
+ username: 1138758025@qq.com
+ # 鎺堟潈鐮� (璁剧疆 - 璐︽埛 - POP3/SMTP鏈嶅姟)
+ password: lwsbmlbqgpaqfgdb
+ # QQ閭鍔犲瘑绔彛锛屼笉鍚岄偖绠辩殑绔彛涓嶄竴鏍�
+ port: 465
+ properties:
+ mail:
+ smtp:
+ socketFactory:
+ class: javax.net.ssl.SSLSocketFactory
+ ssl:
+ trust: smtp.qq.com
+ # 鏄惁闇�瑕佺敤鎴疯璇�
+ auth: true
+ starttls:
+ # 鍚敤TLS鍔犲瘑
+ enable: true
+ required: true
+ datasource:
+ druid:
+ stat-view-servlet:
+ enabled: true
+ url-pattern: /druid/*
+ login-username: 10001
+ login-password: admin123
+ reset-enable: true
+ allow:
+ filters: stat,wall,log4j # 鍚敤鏃ュ織鍜岀洃鎺ц繃婊ゅ櫒
+ stat:
+ mergeSql: true # 鍚堝苟SQL缁熻淇℃伅
+ slowSqlMillis: 3000 # 閰嶇疆 SQL 鎱㈡煡璇㈤槇鍊硷紝鍗曚綅鏄绉掞紝3绉掑嵆 3000ms
+
+# token閰嶇疆
+token:
+ # 浠ょ墝鑷畾涔夋爣璇�
+ header: Authorization
+ # 浠ょ墝瀵嗛挜
+ secret: xaltjdkjyxgs_sjh&1987
+
+ secret_key: ltkj_xaltjdkjsjh
+ # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
+ expireTime: 180
+ # 鏄惁鍏佽璐︽埛澶氱粓绔悓鏃剁櫥褰曪紙true鍏佽 false涓嶅厑璁革級
+ soloLogin: true
+ #鏄惁寮�鍚櫥褰曟椂鍒ゆ柇鍟嗘埛绉橀挜鏄惁杩囨湡
+ secret_key_login: true
+
+# MyBatis Plus閰嶇疆
+mybatis-plus:
+ # 鎼滅储鎸囧畾鍖呭埆鍚�
+ typeAliasesPackage: com.ltkj.**.domain
+ # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
+ mapperLocations: classpath*:mapper/**/*Mapper.xml
+ # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
+ configLocation: classpath:mybatis/mybatis-config.xml
+ global-config:
+ db-config:
+ logic-not-delete-value: 0
+ logic-delete-value: 1
+ update-strategy: not_null
+
+
+# PageHelper鍒嗛〉鎻掍欢
+pagehelper:
+ helperDialect: mysql
+ supportMethodsArguments: true
+ params: count=countSql
+
+# Swagger閰嶇疆
+swagger:
+ # 鏄惁寮�鍚痵wagger
+ enabled: true
+ # 璇锋眰鍓嶇紑
+ pathMapping: /
+
+# 闃叉XSS鏀诲嚮
+xss:
+ # 杩囨护寮�鍏�
+ enabled: true
+ # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
+ excludes: /system/notice,/system/package
+ # 鍖归厤閾炬帴
+ urlPatterns: /system/*,/monitor/*,/tool/*
+
+
+# 浣撴鎶ュ憡妯℃澘鍜屾姤鍛婁复鏃剁敓鎴愬瓨鍌ㄧ殑鏂囦欢澶硅矾寰�
+path:
+ filePath: C:\Tjreport\chkwyy
+ # nginx鍥剧墖鏈嶅姟鍣�
+ reportServer: https://ltpeis.xaltjdkj.cn:5516/
+
+
+# 浣撴濂楅鍜岃疆鎾浘瀛樺偍璺緞
+photoPath: C:\AppPhoto\uploadPath\
+# nginx鍥剧墖鏈嶅姟鍣�
+#photoServer: https://ltpeis.xaltjdkj.cn:5502/uploadPath/
+photoServer: http://192.168.0.5:5502/uploadPath/
+
+
+
+# 寰俊灏忕▼搴廰ppid secret
+xcx:
+ appid: wx40a545f1a8eb1d9d
+ secret: c86c1ff7f91c16380111878e9a259237
+ msgDataFormat: JSON
+ token: token # 寰俊灏忕▼搴忔秷鎭湇鍔″櫒閰嶇疆鐨則oken
+ aesKey: aesKey # 寰俊灏忕▼搴忔秷鎭湇鍔″櫒閰嶇疆鐨凟ncodingAESKey
+# 寮�鍙戣�呭簲璇ヨ缃垚鑷繁鐨剋x鐩稿叧淇℃伅
+wx:
+ # 灏忕▼搴�
+ miniapp:
+ appid: wx40a545f1a8eb1d9d
+ secret: c86c1ff7f91c16380111878e9a259237
+ msg-data-format: XML
+ pay:
+ #appid
+ app-id: wx40a545f1a8eb1d9d
+ mch-id: 1642930999 #鍟嗘埛鍙�
+ mch-key: Xianlutaikeji666888999shijihongL #瀵嗛挜
+ #key-path: E:\mycode\apppwd\1643225121_20230427_cert\apiclient_cert.p12 #鏈湴璇佷功璺緞锛屽湪寰俊鍟嗘埛鍚庡彴涓嬭浇
+ key-path: D:\WXCertUtil\tjcert\apiclient_cert.p12 #鏈嶅姟鍣ㄨ瘉涔﹁矾寰勶紝鍦ㄥ井淇″晢鎴峰悗鍙颁笅杞�
+ # pay-score-notify-url: http://192.168.0.101:5011/cus/order/pay-notify #寰俊鏀粯鍥炶皟鍦板潃
+ # pay-score-notify-url: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin/cus/order/pay-notify #寰俊鏀粯鍥炶皟鍦板潃
+ pay-score-notify-url: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin/cus/order/pay-notify #寰俊鏀粯鍥炶皟鍦板潃
+
+#绉湪鎶ヨ〃璁块棶鍦板潃
+jimu:
+ # path: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin
+ # path: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin
+ path: http://192.168.0.5:5000/ltkj-admin
+# path: http://10.168.0.9:5011
+# path: http://192.168.0.105:5011
+# path: http://192.168.1.113:5011
+
+
+jeecg :
+ jmreport:
+ # 鎵撳嵃绾稿紶閰嶇疆 title鎻忚堪 size瀹介珮
+ printPaper:
+ - title: 灏忕エ鎵撳嵃
+ size:
+ - 40
+ - 60
+# ip = 101.42.27.146
+# prot = 3306
+# name = ltkjpeis10
+# username = root
+# password = Root_ltkj123
+config:
+ properties: C:\ltkjprojectconf\chkwyy-config.properties
+ path: C:\ltkjprojectconf
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 395f5d3..3014b3a 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
@@ -143,12 +143,12 @@
" create_id,\n" +
" pro_type) \n" +
" \n" +
- " SELECT #{orderId},a.pro_id,IFNULL(trim(b.pro_default),null),'0',SYSDATE(),#{userName},b.is_sampling,#{userId},IFNULL(a.pac_id,0)" +
+ " SELECT #{orderId},a.pro_id,IFNULL(trim(b.pro_default),null),IF(b.need_report<>'Y',1,0),SYSDATE(),#{userName},b.is_sampling,#{userId},IFNULL(a.pac_id,0)" +
" FROM tb_transition a LEFT JOIN tj_project b ON a.pro_id=b.pro_id WHERE a.cus_id=#{cusId} AND a.card_id=#{cardId} \n" +
"\t\t\n" +
"\tUNION\n" +
" \n" +
- "\tSELECT #{orderId},a.parent_pro_id,IFNULL(trim(b.pro_default),null),'0',SYSDATE(),#{userName},b.is_sampling,#{userId},IFNULL(a.pac_id,0) " +
+ "\tSELECT #{orderId},a.parent_pro_id,IFNULL(trim(b.pro_default),null),IF(b.need_report<>'Y',1,0),SYSDATE(),#{userName},b.is_sampling,#{userId},IFNULL(a.pac_id,0) " +
"FROM tb_transition a LEFT JOIN tj_project b ON a.parent_pro_id=b.pro_id WHERE a.cus_id=#{cusId} AND a.card_id=#{cardId} GROUP BY a.parent_pro_id")
boolean saveTjOrderDetailsByCusId(@Param("cusId")String cusId,@Param("orderId")String orderId,@Param("userName")String userName,@Param("userId") String userId,@Param("cardId") String cardId);
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 9b6e2a5..397ea96 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
@@ -61,10 +61,11 @@
"tj_number,\n" +
"update_by,\n" +
"update_time,\n" +
- "update_id\n" +
+ "update_id,\n" +
+ "type\n" +
")\n" +
"\n" +
- "SELECT b.pro_id,b.dept_id,SYSDATE(),#{userName},#{userId},#{tjNumber},#{userName},SYSDATE(),#{userId} FROM tj_order_detail a " +
+ "SELECT b.pro_id,b.dept_id,SYSDATE(),#{userName},#{userId},#{tjNumber},#{userName},SYSDATE(),#{userId},IF(b.need_report<>'Y',1,0) FROM tj_order_detail a " +
"LEFT JOIN tj_project b ON a.pro_id=b.pro_id WHERE a.order_id=#{orderId} AND\n" +
"b.pro_parent_id=0")
boolean saveTjOrderRemarkByOrderId(@Param("tjNumber")String tjNumber,@Param("userName") String userName,@Param("userId") String userId,@Param("orderId")String orderId);
@@ -132,7 +133,7 @@
" LEFT JOIN sys_user us ON us.user_id = re.doctor_name\n" +
" WHERE\n" +
// " re.type != 2 AND\n" +
- " re.tj_number = #{tjNumber} and re.dept_id !=532 and pro.pro_name not like '%璐�%'" +
+ " re.tj_number = #{tjNumber} and re.dept_id !=532 and pro.pro_name not like '%璐�%' and pro.need_report='Y'" +
" <when test='sfzpacs == true'> " +
" AND dep.org_type = 2"+
" </when>"+
--
Gitblit v1.8.0