From 2eb40036e885988fbf93ebcb98a339b197fb6340 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 05 六月 2025 17:39:52 +0800
Subject: [PATCH] zjh20250605
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java | 83 ++++++++++++++++++---------
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjJcycxmMapper.java | 5 +
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjJcycxmServiceImpl.java | 5 +
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java | 5 +
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java | 2
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java | 24 +++++--
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java | 5 +
ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjJcycxmService.java | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java | 5 +
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java | 8 ++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java | 2
11 files changed, 110 insertions(+), 36 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java
index 6366910..24567b7 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java
@@ -18,6 +18,7 @@
import com.ltkj.hosp.sqlDomain.LtkjHybgd;
import com.ltkj.hosp.sqlDomain.LtkjHysqd;
import com.ltkj.hosp.vodomain.CsProVo;
+import com.ltkj.web.controller.system.SysConfigController;
import com.ltkj.web.controller.system.TjCheckController;
import io.swagger.annotations.Api;
import jodd.util.StringUtil;
@@ -63,6 +64,8 @@
private ITjCustomerService tjCustomerService;
@Autowired
private TjJcycxmService jcycxmService;
+ @Autowired
+ private SysConfigController configController;
/**
* 鑾峰彇pacs妫�鏌ユ暟鎹�
@@ -285,28 +288,36 @@
ltkjExamJcsqdService.deletedLtkjJcsqdByTjhAndXmId(ltkjExamJcsqd.getTjh(), ltkjExamJcsqd.getJcxmid());
boolean save1 = ltkjExamJcsqdService.save(ltkjExamJcsqd);
- log.info("鎵嬪姩鍚屾妫�鏌ョ粨鏋滅姸鎬� ->{}", ltkjExamJcsqd.getJgzt());
+ /* log.info("鎵嬪姩鍚屾妫�鏌ョ粨鏋滅姸鎬� ->{}", ltkjExamJcsqd.getJgzt());
if (StringUtil.isNotBlank(ltkjExamJcsqd.getJgzt())) {
- jcycxmService.deletedByTjh(order.getTjNumber());
+// jcycxmService.deletedByTjh(order.getTjNumber());
+ jcycxmService.deletedByTjhAndXmm(order.getTjNumber(),ltkjExamJcsqd.getJcxmmc());
String[] split = ltkjExamJcsqd.getJgzt().replaceAll("\n", "").split("銆倈锛泑;|,|锛�");
log.info("杩涘叆妫�鏌ョ粨鏋滃紓甯告彁鍙栧垎鍓叉柟娉曚綋 ->{}->{}", order.getTjNumber(), split);
for (String jg : split) {
if (StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
&& !jg.contains("鏈鏄庢樉寮傚父") && !jg.contains("鏈鍗犱綅") && !jg.contains("鏈")
&& !jg.contains("鏈鏄庢樉") && !jg.contains("姝ｅ父") && !jg.contains("鍙屼晶妞庨棿瀛旀棤鐙獎")) {
- TjJcycxm jcycxm = new TjJcycxm();
- jcycxm.setTjh(order.getTjNumber());
- jcycxm.setYqid("jczyy");
- String[] split1 = ltkjExamJcsqd.getJcxmid().split(";");
- jcycxm.setProId(split1[0]);
- jcycxm.setProName(ltkjExamJcsqd.getJcxmmc());
- jcycxm.setCreateTime(new Date());
- jcycxm.setJcjg(jg);
- jcycxmService.save(jcycxm);
+ log.info("杩涘叆妫�鏌ョ粨鏋滃紓甯告彁鍙� 鍗冲皢淇濆瓨妫�鏌ュ紓甯哥粨鏋�->{}->{}", order.getTjNumber(), jg);
+ try {
+ TjJcycxm jcycxm = new TjJcycxm();
+ jcycxm.setTjh(order.getTjNumber());
+ jcycxm.setYqid("jczyy");
+ String[] split1 = ltkjExamJcsqd.getJcxmid().split(";");
+ jcycxm.setProId(split1[0]);
+ jcycxm.setProName(ltkjExamJcsqd.getJcxmmc());
+ jcycxm.setCreateTime(new Date());
+ jcycxm.setJcjg(jg);
+ jcycxmService.save(jcycxm);
+ } catch (Exception e) {
+ logger.error("淇濆瓨妫�鏌ュ紓甯哥粨鏋滃け璐�",e);
+ throw new RuntimeException(e);
+ }
+ log.info("杩涘叆妫�鏌ョ粨鏋滃紓甯告彁鍙� 淇濆瓨妫�鏌ュ紓甯哥粨鏋滃畬姣�");
}
}
}
-
+*/
LtkjExamJcbgd ltkjExamJcbgd = new LtkjExamJcbgd();
ltkjExamJcbgd.setTjh(ltkjExamJcsqd.getTjh());
ltkjExamJcbgd.setTmh(ltkjExamJcsqd.getTmh());
@@ -333,7 +344,10 @@
boolean save2 = ltkjExamJcbgdService.save(ltkjExamJcbgd);
if (save1 && save2) {
try {
- testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
+
+ configController.tjjcycxm(tjNum, "0");
+// testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
+ orderRemarkService.updateTjOrderRemarkByTjzt(order.getTjNumber(),project.getProId().toString());
} catch (Exception e) {
log.error(String.valueOf(e));
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -441,8 +455,10 @@
hybgdService.save(hybgd);
}
try {
- testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
+// testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
+ orderRemarkService.updateTjOrderRemarkByTjzt(order.getTjNumber(),project.getProId().toString());
} catch (Exception e) {
+
log.error(String.valueOf(e));
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return AjaxResult.error("鍚屾澶辫触璇烽噸璇�");
@@ -540,27 +556,35 @@
// ltkjExamJcsqdService.deletedLtkjJcsqdByTjhAndXmId(ltkjExamJcsqd.getTjh(), ltkjExamJcsqd.getJcxmid());
ltkjExamJcsqdService.sdtbdeletedLtkjJcsqdByTjhandtmh(ltkjExamJcsqd.getTjh(), ltkjExamJcsqd.getTmh());
boolean save1 = ltkjExamJcsqdService.save(ltkjExamJcsqd);
- log.info("鎵嬪姩鍚屾妫�鏌ョ粨鏋滅姸鎬� ->{}", ltkjExamJcsqd.getJgzt());
+ /* log.info("鎵嬪姩鍚屾妫�鏌ョ粨鏋滅姸鎬� ->{}", ltkjExamJcsqd.getJgzt());
if (StringUtil.isNotBlank(ltkjExamJcsqd.getJgzt())) {
- jcycxmService.deletedByTjh(order.getTjNumber());
+// jcycxmService.deletedByTjh(order.getTjNumber());
+ jcycxmService.deletedByTjhAndXmm(order.getTjNumber(),ltkjExamJcsqd.getJcxmmc());
String[] split = ltkjExamJcsqd.getJgzt().replaceAll("\n", "").split("銆倈锛泑;|,|锛�");
log.info("杩涘叆妫�鏌ョ粨鏋滃紓甯告彁鍙栧垎鍓叉柟娉曚綋 ->{}->{}", order.getTjNumber(), split);
for (String jg : split) {
if (StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
&& !jg.contains("鏈鏄庢樉寮傚父") && !jg.contains("鏈鍗犱綅") && !jg.contains("鏈")
&& !jg.contains("鏈鏄庢樉") && !jg.contains("姝ｅ父") && !jg.contains("鍙屼晶妞庨棿瀛旀棤鐙獎")) {
- TjJcycxm jcycxm = new TjJcycxm();
- jcycxm.setTjh(order.getTjNumber());
- jcycxm.setYqid("jczyy");
- String[] split1 = ltkjExamJcsqd.getJcxmid().split(";");
- jcycxm.setProId(split1[0]);
- jcycxm.setProName(ltkjExamJcsqd.getJcxmmc());
- jcycxm.setCreateTime(new Date());
- jcycxm.setJcjg(jg);
- jcycxmService.save(jcycxm);
+ log.info("杩涘叆妫�鏌ョ粨鏋滃紓甯告彁鍙� 鍗冲皢淇濆瓨妫�鏌ュ紓甯哥粨鏋�->{}->{}", order.getTjNumber(), jg);
+ try {
+ TjJcycxm jcycxm = new TjJcycxm();
+ jcycxm.setTjh(order.getTjNumber());
+ jcycxm.setYqid("jczyy");
+ String[] split1 = ltkjExamJcsqd.getJcxmid().split(";");
+ jcycxm.setProId(split1[0]);
+ jcycxm.setProName(ltkjExamJcsqd.getJcxmmc());
+ jcycxm.setCreateTime(new Date());
+ jcycxm.setJcjg(jg);
+ jcycxmService.save(jcycxm);
+ } catch (Exception e) {
+ log.error("淇濆瓨妫�鏌ュ紓甯哥粨鏋滃け璐�",e);
+ throw new RuntimeException(e);
+ }
+ log.info("杩涘叆妫�鏌ョ粨鏋滃紓甯告彁鍙� 淇濆瓨妫�鏌ュ紓甯哥粨鏋滃畬姣�");
}
}
- }
+ }*/
LtkjExamJcbgd ltkjExamJcbgd = new LtkjExamJcbgd();
ltkjExamJcbgd.setTjh(ltkjExamJcsqd.getTjh());
@@ -588,7 +612,9 @@
boolean save2 = ltkjExamJcbgdService.save(ltkjExamJcbgd);
if (save1 && save2) {
try {
- testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
+ configController.tjjcycxm(tjNum, "0");
+// testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
+ orderRemarkService.updateTjOrderRemarkByTjzt(order.getTjNumber(),project.getProId().toString());
} catch (Exception e) {
log.error(String.valueOf(e));
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -698,7 +724,8 @@
hybgdService.save(hybgd);
}
try {
- testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
+// testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
+ orderRemarkService.updateTjOrderRemarkByTjzt(order.getTjNumber(),project.getProId().toString());
} catch (Exception e) {
log.error(String.valueOf(e));
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
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 4cf674c..326905a 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
@@ -412,20 +412,28 @@
@GetMapping ("/tjjcycxm")//鍚屾his椤圭洰鍗曚环淇℃伅
// @PreAuthorize("@ss.hasPermi('system:config:tbhisproprice')")
@ApiOperation (value = "tjjcycxm")
- public AjaxResult tjjcycxm(@RequestParam(required = false)@ApiParam(value = "浣撴鍙�") String tjh) {
+ public AjaxResult tjjcycxm(@RequestParam(required = false)@ApiParam(value = "浣撴鍙�") String tjh,
+ @RequestParam(defaultValue = "0",required = false)@ApiParam(value = "0 浠呭悓姝ユ湭瀹℃牳浜哄憳 1鎵�鏈変汉") String lx) {
String yqbm = configService.selectConfigByKey("dqyyyqbm");
if(StringUtil.isNotBlank(tjh)){
zongjianshengchengyichangxiangmu(tjh, yqbm);
return AjaxResult.success();
- }
- List<String> jc = orderService.getJianChaTjNum();
- if (null != jc && !jc.isEmpty()) {
- for (String s : jc) {
- zongjianshengchengyichangxiangmu(s, yqbm);
-
+ }else {
+ List<String> jc =null;
+ if(lx.equals("0")){
+ jc = orderService.getJianChaTjNumWsh();
+ }else {
+ jc = orderService.getJianChaTjNum();
}
+
+ if (null != jc && !jc.isEmpty()) {
+ for (String s : jc) {
+ zongjianshengchengyichangxiangmu(s, yqbm);
+ }
+ }
+ return AjaxResult.success();
}
- return AjaxResult.success();
+
}
public void zongjianshengchengyichangxiangmu(String s, String yqbm) {
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjJcycxmMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjJcycxmMapper.java
index 9af65e3..a89a910 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjJcycxmMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjJcycxmMapper.java
@@ -4,6 +4,7 @@
import com.ltkj.hosp.domain.TjJcycxm;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
/**
* ClassName: TjJcycxmMapper <br/>
@@ -16,4 +17,8 @@
public interface TjJcycxmMapper extends BaseMapper<TjJcycxm> {
@Delete("DELETE FROM tj_jcycxm WHERE tjh=#{s}")
void deletedByTjh(String s);
+
+
+ @Delete("DELETE FROM tj_jcycxm WHERE tjh= #{s} AND pro_name=#{xmmc}")
+ void deletedByTjhAndXmm(@Param("s") String s,@Param("xmmc") String xmmc);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
index 2bda91c..005dcb2 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
@@ -388,6 +388,14 @@
List<String> getJianChaTjNum();
+ @Select("SELECT a.tj_number FROM tj_order a WHERE a.deleted=0 AND a.check_status=0 AND\n" +
+ "ISNULL(a.report_time)")
+ List<String> getJianChaTjNumWsh();
+
+
+
+
+
List<List<?>> getYxJcList(Map<String,Object> map);
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 a51db9f..c4121cf 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
@@ -312,4 +312,9 @@
@Select("call tj_yxjcymxx(#{tjh,mode=IN},#{ks,mode=IN})")
List<CsProVo> getYxJcXx(@Param("tjh")String tjNumber,@Param("ks")String ks);
+
+
+ @Update("UPDATE tj_order_remark a " +
+ "SET a.type=1 WHERE a.tj_number=#{tjNumber} and a.pro_id=#{proId}")
+ int updateTjOrderRemarkByTjzt(@Param("tjNumber") String tjNumber,@Param("proId") String proId);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java
index e1a6112..d11357d 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java
@@ -102,4 +102,6 @@
List<TjOrderRemark> shoufeiyemianweishoufei(String tjNumber,String jxbz);
List<CsProVo> getYxJcXx(String tjNumber,String ks);
+
+ int updateTjOrderRemarkByTjzt(String tjNumber,String proId);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
index 79be679..fc1a41a 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
@@ -185,6 +185,8 @@
List<String> getJianChaTjNum();
+ List<String> getJianChaTjNumWsh();
+
void tjQiandaodengji(String tjNum);
void tjLispacstongbujianyi(String tjNumber, Long deptId,String nickName, Long userId);
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjJcycxmService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjJcycxmService.java
index d692c43..693d462 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjJcycxmService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjJcycxmService.java
@@ -14,4 +14,6 @@
public interface TjJcycxmService extends IService<TjJcycxm> {
void deletedByTjh(String s);
+
+ void deletedByTjhAndXmm(String s,String xmmc);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjJcycxmServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjJcycxmServiceImpl.java
index 7782c12..1306760 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjJcycxmServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjJcycxmServiceImpl.java
@@ -24,4 +24,9 @@
public void deletedByTjh(String s) {
mapper.deletedByTjh(s);
}
+
+ @Override
+ public void deletedByTjhAndXmm(String s, String xmmc) {
+ mapper.deletedByTjhAndXmm(s,xmmc);
+ }
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java
index 753072d..dddcdf8 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java
@@ -209,4 +209,9 @@
return yxJcXx;
}
+ @Override
+ public int updateTjOrderRemarkByTjzt(String tjNumber,String proId) {
+ return mapper.updateTjOrderRemarkByTjzt(tjNumber, proId);
+ }
+
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
index 64f2e54..89b2d7e 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
@@ -422,6 +422,11 @@
}
@Override
+ public List<String> getJianChaTjNumWsh() {
+ return tjOrderMapper.getJianChaTjNumWsh();
+ }
+
+ @Override
public void tjQiandaodengji(String tjNum) {
Map<String, Object> map = new HashMap<>();
map.put("tjNum",tjNum);
--
Gitblit v1.8.0