From a841968432012044f4ae1c15b584f45f35a4f876 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 08 七月 2024 18:17:41 +0800
Subject: [PATCH] zjh 2024/07/8-2
---
ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjExamJcsqd.java | 1 +
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 3 ++-
ltkj-admin/src/main/resources/application.yml | 2 +-
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java | 4 ++--
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderRemark.java | 6 ++++++
5 files changed, 12 insertions(+), 4 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 eac56bd..967e833 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
@@ -930,7 +930,8 @@
Map<String, Object> parent = new HashMap<>();
parent.put("checkAdvice", one.getCheckAdvice());
parent.put("parent", remark.getProName());
- parent.put("parentId", remark.getProsId().toString());
+ parent.put("parentId", remark.getProsId());
+ parent.put("xmlb", remark.getXmlb());
List<TjOrderDetail> dels = new ArrayList<>();
if (null != tjOrderDetails && tjOrderDetails.size() > 0) {
for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
diff --git a/ltkj-admin/src/main/resources/application.yml b/ltkj-admin/src/main/resources/application.yml
index 7fbd094..64865e4 100644
--- a/ltkj-admin/src/main/resources/application.yml
+++ b/ltkj-admin/src/main/resources/application.yml
@@ -4,4 +4,4 @@
#test 娉惧窛鍘块儴缃叉祴璇曠幆澧冧娇鐢�
spring:
profiles:
- active: dev
\ No newline at end of file
+ active: test
\ No newline at end of file
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 dd949c8..39e9ba8 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
@@ -121,6 +121,12 @@
@ApiModelProperty(value = "鍔犻」鏍囧織")
private String jxbz;
+
+ @ApiModelProperty(value = "椤圭洰绫诲埆")
+ @TableField(exist = false)
+ private String xmlb;
+
+
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java
index 87387a7..7e5306f 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java
@@ -31,7 +31,7 @@
@Insert("INSERT INTO ltkj_exam_jcsqd \n" +
"SELECT a.tjh,a.tmh,NULL jclx,NULL jczlx,a.shysxm bgys,a.shysdm bgysid,a.sqsj,a.zdsj jgsj, a.xmmc jcxmmc,a.xmdm jcxmid,a.jcbw bw,\n" +
- "CONCAT(a.bg_nr,'(',a.yxzd,',',a.yxbx,')') jgzt\n" +
- "FROM ltkj_exam_jcbgd a WHERE a.tjh=#{tjh} GROUP BY a.tmh;")
+ "a.yxzd jgzt,a.yxbx jgbx\n" +
+ "FROM ltkj_exam_jcbgd a WHERE a.tjh=#{tjh} GROUP BY a.tmh")
void saveLtkjExamJcsqd(String tjh);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjExamJcsqd.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjExamJcsqd.java
index bc1995e..a56498d 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjExamJcsqd.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjExamJcsqd.java
@@ -20,4 +20,5 @@
private String jcxmid;
private String bw;
private String jgzt;
+ private String jgbx;
}
--
Gitblit v1.8.0