From ff8914dab90da51dc8d46010f4f658780d5dba0e Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 14 四月 2025 17:27:43 +0800
Subject: [PATCH] zjh20250414
---
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProAdvicerulesServiceImpl.java | 9 +++-
ltkj-common/src/main/java/com/ltkj/common/core/domain/TreeSelect.java | 4 ++
ltkj-common/src/main/java/com/ltkj/common/core/domain/entity/SysDept.java | 4 ++
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProAdvicerulesMapper.java | 10 ++++-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProAdvicerulesController.java | 12 ++++++
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 4 +-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCustomerMapper.java | 5 ++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 4 +
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjCustomerService.java | 2 +
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjCustomerServiceImpl.java | 5 ++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProAdvicerulesService.java | 5 ++
12 files changed, 57 insertions(+), 9 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
index bcaa9a3..6ca25c6 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
@@ -608,7 +608,7 @@
}else {
deptname=dept.getDeptName();
}
-
+ String xb= tjCustomerService.getSexByTjh(order.getTjNumber());
for (TjOrderDetail detail : tjOrderDetailList) {
detail.setTjStatus(1L);
@@ -637,7 +637,7 @@
for (String s : split) {
s = s.replaceAll("\n", "");
// Map<String,Object> maps= rulesService.getyichangxiangmujianyiguizeJianCha(s);
- Map<String,Object> mapss= tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(deptname,s,"0");
+ Map<String,Object> mapss= tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(deptname,s,"0",xb);
if(null !=mapss && !mapss.isEmpty()){
Object bt = mapss.get("bt");
Object nr = mapss.get("nr");
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 fd03825..687b4ba 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
@@ -1820,6 +1820,8 @@
private List<Map<String, Object>> zongjianyishengchakanyichangxiangmu(String tjNumber) {
// asyncService.updateCheckType(tjNumber);
+ String xb= customerService.getSexByTjh(tjNumber);
+
List<TjOrderRemark> remarkList = orderRemarkService.getzongjianyishengchakanyichangxiangmu(tjNumber);
List<TjOrderDetail> tjOrderDetails = detailService.getzongjianyishengchakanyichangxiangmu(tjNumber);
List<Map<String, Object>> list = new ArrayList<>();
@@ -1851,7 +1853,7 @@
for (String s : split) {
s = s.replaceAll("\n", "");
// Map<String,Object> maps= rulesService.getyichangxiangmujianyiguizeJianCha(s);
- Map<String, Object> maps = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(remark.getKs(), s, "0");
+ Map<String, Object> maps = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(remark.getKs(), s, "0",xb);
if (null != maps && !maps.isEmpty()) {
Object bt = maps.get("bt");
Object nr = maps.get("nr");
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProAdvicerulesController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProAdvicerulesController.java
index e46c81c..6df106c 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProAdvicerulesController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProAdvicerulesController.java
@@ -162,4 +162,16 @@
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(tjProAdvicerulesService.deleteTjProAdvicerulesByIds(ids));
}
+
+
+
+ @GetMapping("/getTjProAdvicerulesKsList")
+ @ApiOperation(value = "鑾峰彇浣撴璇婃柇寤鸿绉戝鍒楄〃鎺ュ彛")
+ public AjaxResult getTjProAdvicerulesKsList() {
+ List<String> tjProAdvicerulesKsList = tjProAdvicerulesService.getTjProAdvicerulesKsList();
+ return AjaxResult.success(tjProAdvicerulesKsList);
+ }
+
+
+
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java
index 8a38e4d..4c8bb69 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java
@@ -390,7 +390,7 @@
jcbgd.setShysxm(xdtgmdjg.getCreateBy());
jcbgd.setShysdm(xdtgmdjg.getCreateId());
jcbgd.setYxzd(xdtgmdjg.getJcjl());
- jcbgd.setYxbx("鏈寮傚父");
+ jcbgd.setYxbx(xdtgmdjg.getJcjl());
jcbgd.setZdsj(DateUtil.format(date,"yyyy-MM-dd"));
jcbgd.setJcbw("");
jcbgd.setSqsj(DateUtil.format(date,"yyyy-MM-dd"));
diff --git a/ltkj-common/src/main/java/com/ltkj/common/core/domain/TreeSelect.java b/ltkj-common/src/main/java/com/ltkj/common/core/domain/TreeSelect.java
index 87f710c..9bffff6 100644
--- a/ltkj-common/src/main/java/com/ltkj/common/core/domain/TreeSelect.java
+++ b/ltkj-common/src/main/java/com/ltkj/common/core/domain/TreeSelect.java
@@ -4,6 +4,7 @@
import java.util.List;
import java.util.stream.Collectors;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -36,6 +37,8 @@
private String status;
+ private String dj;
+
/**
* 瀛愯妭鐐�
*/
@@ -51,6 +54,7 @@
this.label = dept.getDeptName();
this.qf=dept.getQf();
this.status=dept.getStatus();
+ this.dj=dept.getDj();
this.children = dept.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
}
diff --git a/ltkj-common/src/main/java/com/ltkj/common/core/domain/entity/SysDept.java b/ltkj-common/src/main/java/com/ltkj/common/core/domain/entity/SysDept.java
index 07668f9..c232503 100644
--- a/ltkj-common/src/main/java/com/ltkj/common/core/domain/entity/SysDept.java
+++ b/ltkj-common/src/main/java/com/ltkj/common/core/domain/entity/SysDept.java
@@ -208,6 +208,10 @@
@TableField(exist = false)
private String qf;
+
+ @TableField(exist = false)
+ private String dj;
+
/**
* 椤圭洰妫�鏌ョ姸鎬� 灏忕▼搴忕敤
*/
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 cba88aa..5479bac 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
@@ -108,4 +108,9 @@
List<Map<String ,Object >> getCusInfoList(String card);
List<Map<String ,Object >> getCusInfoListByCardAndName(@Param("card") String card,@Param("name") String name);
+
+
+ @Select("SELECT IF(b.cus_sex=0,'鐢�','濂�') xb FROM tj_order a JOIN tj_customer b ON b.cus_id=a.user_id \n" +
+ "WHERE a.tj_number=#{tjNumber}")
+ String getSexByTjh(String tjNumber);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProAdvicerulesMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProAdvicerulesMapper.java
index bf6dabe..096ffe7 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProAdvicerulesMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProAdvicerulesMapper.java
@@ -67,6 +67,12 @@
@Select("call tj_new_advicerules(\n" +
- " #{ks,mode=IN,jdbcType=VARCHAR},#{jg,mode=IN,jdbcType=VARCHAR},#{kslx,mode=IN,jdbcType=VARCHAR} )")
- Map<String, Object> getyichangxiangmujianyiguizeJianCha(@Param("ks") String ks,@Param("jg") String s,@Param("kslx") String kslx);
+ " #{ks,mode=IN,jdbcType=VARCHAR},#{jg,mode=IN,jdbcType=VARCHAR}," +
+ "#{kslx,mode=IN,jdbcType=VARCHAR},#{xb,mode=IN,jdbcType=VARCHAR} )")
+ Map<String, Object> getyichangxiangmujianyiguizeJianCha(@Param("ks") String ks,@Param("jg") String s,@Param("kslx") String kslx,@Param("xb") String xb);
+
+
+
+ @Select("SELECT a.ks FROM tj_pro_advicerules a WHERE a.deleted=0 GROUP BY a.ks")
+ List<String> getTjProAdvicerulesKsList();
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjCustomerService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjCustomerService.java
index 4f17f35..b363cd3 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjCustomerService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjCustomerService.java
@@ -75,4 +75,6 @@
List<Map<String, Object>> vcustomerlist(String name, String sjh, String sfzh);
List<TjCustomer> getcusList(TjCustomer tjCustomer);
+
+ String getSexByTjh(String tjNumber);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProAdvicerulesService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProAdvicerulesService.java
index 26a7f55..0b506e3 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProAdvicerulesService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProAdvicerulesService.java
@@ -61,5 +61,8 @@
*/
public int deleteTjProAdvicerulesById(Long id);
- Map<String, Object> getyichangxiangmujianyiguizeJianCha(String ks, String s, String kslx);
+ Map<String, Object> getyichangxiangmujianyiguizeJianCha(String ks, String s, String kslx,String xb);
+
+
+ List<String> getTjProAdvicerulesKsList();
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjCustomerServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjCustomerServiceImpl.java
index a352801..8f0210a 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjCustomerServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjCustomerServiceImpl.java
@@ -128,4 +128,9 @@
public List<TjCustomer> getcusList(TjCustomer tjCustomer) {
return tjCustomerMapper.getcusList(tjCustomer);
}
+
+ @Override
+ public String getSexByTjh(String tjNumber) {
+ return tjCustomerMapper.getSexByTjh(tjNumber);
+ }
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProAdvicerulesServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProAdvicerulesServiceImpl.java
index 05c41d9..ac6eb49 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProAdvicerulesServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProAdvicerulesServiceImpl.java
@@ -92,7 +92,12 @@
}
@Override
- public Map<String, Object> getyichangxiangmujianyiguizeJianCha(String ks, String s, String kslx) {
- return tjProAdvicerulesMapper.getyichangxiangmujianyiguizeJianCha(ks,s,kslx);
+ public Map<String, Object> getyichangxiangmujianyiguizeJianCha(String ks, String s, String kslx,String xb) {
+ return tjProAdvicerulesMapper.getyichangxiangmujianyiguizeJianCha(ks,s,kslx,xb);
+ }
+
+ @Override
+ public List<String> getTjProAdvicerulesKsList() {
+ return tjProAdvicerulesMapper.getTjProAdvicerulesKsList();
}
}
--
Gitblit v1.8.0