From 8246d632bce9b8e325e8765a214590a30cb5b273 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 10 十二月 2024 23:11:13 +0800
Subject: [PATCH] zjh202412010
---
ltkj-admin/src/main/java/com/ltkj/web/controller/dongfanghis/DfHisApiMethodService.java | 118 ++++++++++++++++++++++++++---
ltkj-hosp/src/main/java/com/ltkj/hosp/dfDto/FeiYongIdDto.java | 16 ++++
ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java | 4 +
ltkj-hosp/src/main/java/com/ltkj/hosp/dfDto/FeiYongMxDto.java | 3
ltkj-hosp/src/main/java/com/ltkj/hosp/dfDto/CheXiaoMzFyDto.java | 25 ++++++
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 7 +
ltkj-hosp/src/main/resources/mapper/TestMapper.xml | 4
ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjAsyncService.java | 1
ltkj-hosp/src/main/java/com/ltkj/hosp/dfDto/CreateMenZhenFyDto.java | 4
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java | 1
10 files changed, 164 insertions(+), 19 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java b/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java
index 6a6e5cc..60d1ec7 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java
@@ -51,6 +51,9 @@
private LtkjHysqdService ltkjHysqdService;
@Resource
private TestMapper testMapper;
+ @Resource
+ private TjAsyncService asyncService;
+
private final ReentrantLock reentrantLock = new ReentrantLock();
@@ -142,6 +145,7 @@
Map<String,Object> map=new HashMap<>();
map.put("tjnum", s);
testMapper.tjUpdateDetatilByVi(map);
+// asyncService.tjUpdateDetatilByVi(s);
log.info("瀹氭椂浠诲姟瀛樺偍杩囩▼宸叉墽琛�!!!");
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/dongfanghis/DfHisApiMethodService.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/dongfanghis/DfHisApiMethodService.java
index fc5722e..5ef2e15 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/dongfanghis/DfHisApiMethodService.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/dongfanghis/DfHisApiMethodService.java
@@ -2,7 +2,10 @@
import cn.hutool.core.date.DateUtil;
import com.ltkj.common.core.domain.AjaxResult;
+import com.ltkj.hosp.dfDto.CheXiaoMzFyDto;
+import com.ltkj.hosp.dfDto.CreateMenZhenFyDto;
import com.ltkj.hosp.domain.TjCustomer;
+import com.ltkj.system.service.ISysConfigService;
import com.ltkj.web.wxUtils.HttpClientUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +30,9 @@
@Component
@Slf4j
public class DfHisApiMethodService {
+
+ @Autowired
+ private ISysConfigService configService;
private static String HIS_URL = "";
@@ -73,17 +79,19 @@
//寤烘。
public AjaxResult jianDang (TjCustomer customer) {
+ String czy = configService.selectConfigByKey("dfhisczybm");
+
Map<String, Object> map = new HashMap<> ();
map.put ("jiuZhenKh", customer.getPationId ());
map.put ("kaiLeiXing","4");
map.put ("xingMing", customer.getCusName ());
Long cusSex = customer.getCusSex();
if(cusSex==0L){
- map.put ("xingBie",1);
+ map.put ("xingBie","鐢�");
}else if(cusSex==1L){
- map.put ("xingBie",2);
+ map.put ("xingBie","濂�");
}else {
- map.put ("xingBie",9);
+ map.put ("xingBie","鏈煡");
}
map.put ("shenFenZh", customer.getCusIdcard ());
map.put ("danWeiBh","");
@@ -93,7 +101,7 @@
map.put ("feiYongLb","");
map.put ("feiYongXz","");
map.put ("jiLuLy","3");
- map.put ("caoZuoYuan","1088");
+ map.put ("caoZuoYuan",czy);
map.put ("chongZhiJe","");
map.put ("yiBaoKh","");
map.put ("geRenBh","");
@@ -112,8 +120,9 @@
//楠岃瘉韬唤璇佹槸鍚﹀缓杩囨。
public AjaxResult getBingRenXxByShengFenZheng (TjCustomer customer) {
+ String czy = configService.selectConfigByKey("dfhisczybm");
Map<String, Object> map = new HashMap<> ();
- map.put ("caoZuoYuan","1088");
+ map.put ("caoZuoYuan",czy);
map.put ("shenFenZh", customer.getCusIdcard ());
map.put ("danWeiBh","");
//鑱屼笟缂栫爜
@@ -123,17 +132,18 @@
//鐥呬汉鍩烘湰淇℃伅鍙樻洿
public AjaxResult saveBingRenXx (TjCustomer customer) {
+ String czy = configService.selectConfigByKey("dfhisczybm");
Map<String, Object> map = new HashMap<> ();
map.put ("jiuZhenKh", customer.getPationId ());
map.put ("kaiLeiXing","4");
map.put ("xingMing", customer.getCusName ());
Long cusSex = customer.getCusSex();
if(cusSex==0L){
- map.put ("xingBie",1);
+ map.put ("xingBie","鐢�");
}else if(cusSex==1L){
- map.put ("xingBie",2);
+ map.put ("xingBie","濂�");
}else {
- map.put ("xingBie",9);
+ map.put ("xingBie","鏈煡");
}
map.put ("shenFenZh", customer.getCusIdcard ());
map.put ("danWeiBh","");
@@ -143,7 +153,7 @@
map.put ("feiYongLb","");
map.put ("feiYongXz","");
map.put ("jiLuLy","3");
- map.put ("caoZuoYuan","1088");
+ map.put ("caoZuoYuan",czy);
//鑱屼笟缂栫爜
String post = HttpClientUtils.sendPost (HIS_URL+"/menZhenJz/saveBingRenXx", map);
return AjaxResult.success ().put ("data", post);
@@ -162,15 +172,97 @@
//寰呮敹璐硅垂鐢ㄦ煡璇�
- public AjaxResult createMenZhenFy (String bingRenId,String jiuZhenKh,String yuanQuId) {
+ public AjaxResult createMenZhenFy (CreateMenZhenFyDto dto) {
+ String czy = configService.selectConfigByKey("dfhisczybm");
Map<String, Object> map = new HashMap<> ();
- map.put ("bingRenId",bingRenId);
- map.put ("jiuZhenKh",jiuZhenKh);
- map.put ("yuanQuId",yuanQuId);
+ map.put ("bingRenId",dto.getBingRenId());
+ map.put ("jiuZhenKh",dto.getJiuZhenKh());
+ map.put ("caoZuoYuan",czy);
+ map.put ("yuanQuId",dto.getYuanQuId());
+ map.put ("yingYongId",dto.getYingYongId());
+ map.put ("kaiDanKs",dto.getKaiDanKs());
+ map.put ("dengJiLsh",dto.getDengJiLsh());
+ map.put ("shouTuiBz",dto.getShouTuiBz());
+ map.put ("feiYongMxList",dto.getFeiYongMxList());
//鑱屼笟缂栫爜
String post = HttpClientUtils.sendPost (HIS_URL+"/shouFei/createMenZhenFy", map);
return AjaxResult.success ().put ("data", post);
}
+ //闂ㄨ瘖鏈敹璐硅垂鐢ㄦ挙閿�
+ public AjaxResult cheXiaoMzFy (CheXiaoMzFyDto dto) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("bingRenId",dto.getBingRenId());
+ map.put ("jiuZhenKh",dto.getJiuZhenKh());
+ map.put ("feiYongIdList",dto.getFeiYongIdList());
+ //鑱屼笟缂栫爜
+ String post = HttpClientUtils.sendPost (HIS_URL+"/shouFei/cheXiaoMzFy", map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+
+ //鏀惰垂/閫�璐瑰畬鎴愰�氱煡绗笁鏂�
+ public AjaxResult pushZhiFuMsg (String feiYongId,int yeWuLx ) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("feiYongId",feiYongId);
+ map.put ("yeWuLx",yeWuLx);
+ //鑱屼笟缂栫爜
+ String post = HttpClientUtils.sendPost (HIS_URL+"/shouFei/pushZhiFuMsg", map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+
+ //绉戝淇℃伅鏌ヨ
+ public AjaxResult getKeShi (String yuanQuId,String keShiMc,int pageIndex,int pageSize ) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("yuanQuId",yuanQuId);
+ map.put ("keShiMc",keShiMc);
+ map.put ("pageIndex",pageIndex);
+ map.put ("pageSize",pageSize);
+ //鑱屼笟缂栫爜
+ String post = HttpClientUtils.sendPost (HIS_URL+"/zhuShuJu/getKeShi", map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+ //鍖荤敓淇℃伅鏌ヨ
+ public AjaxResult getListYiShengZd (String yuanQuId,String keShiMc,int pageIndex,int pageSize ) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("yuanQuId",yuanQuId);
+ map.put ("keShiMc",keShiMc);
+ map.put ("bianGengSj","");
+ map.put ("pageIndex",pageIndex);
+ map.put ("pageSize",pageSize);
+ //鑱屼笟缂栫爜
+ String post = HttpClientUtils.sendPost (HIS_URL+"/zhuShuJu/getListYiShengZd", map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+
+ //鑾峰彇鏀惰垂椤圭洰鍒嗛〉
+ public AjaxResult getShouFeiXm (String queryString,String bianGengSj,int pageIndex,int pageSize ) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("queryString",queryString);
+ map.put ("bianGengSj",bianGengSj);
+ map.put ("pageIndex",pageIndex);
+ map.put ("pageSize",pageSize);
+ //鑱屼笟缂栫爜
+ String post = HttpClientUtils.sendPost (HIS_URL+"/zhuShuJu/getShouFeiXm", map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+
+ //3.9绉戝淇℃伅鎺ㄩ��
+// public AjaxResult getShouFeiXm (String queryString,String bianGengSj,int pageIndex,int pageSize ) {
+// Map<String, Object> map = new HashMap<> ();
+// map.put ("queryString",queryString);
+// map.put ("bianGengSj",bianGengSj);
+// map.put ("pageIndex",pageIndex);
+// map.put ("pageSize",pageSize);
+// //鑱屼笟缂栫爜
+// String post = HttpClientUtils.sendPost (HIS_URL+"/zhuShuJu/getShouFeiXm", map);
+// return AjaxResult.success ().put ("data", post);
+// }
+
+
}
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 d752b28..a981fd1 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
@@ -2299,6 +2299,8 @@
addCaiYangDengJi(detailList, detailList.size() > 0, order, sysUser,null);
}
+
+
//棣栭〉楗肩姸鍥剧櫥璁颁汉鏁版帴鍙�
private AjaxResult getPieCharts() {
Map<String, Object> map = new HashMap<>();
@@ -3275,4 +3277,9 @@
map.put("remark", remark.getRemark());
return map;
}
+
+ @Override
+ public void tjUpdateDetatilByVi(String s) {
+
+ }
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/dfDto/CheXiaoMzFyDto.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/dfDto/CheXiaoMzFyDto.java
new file mode 100644
index 0000000..69d0da0
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/dfDto/CheXiaoMzFyDto.java
@@ -0,0 +1,25 @@
+package com.ltkj.hosp.dfDto;
+
+import com.ltkj.hosp.domain.LisJyflhb;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * ClassName: CheXiaoMzFyDto <br/>
+ * Description: <br/>
+ * date: 2024/12/10 20:12<br/>
+ *
+ * @author zjh<br />
+ */
+@Data
+public class CheXiaoMzFyDto {
+ //灏辫瘖鍗″彿
+ private String jiuZhenKh;
+
+ //鐥呬汉Id(鍦℉IS涓殑鍞竴鐮�)
+ private String bingRenId;
+
+ //璐圭敤id
+ private List<FeiYongIdDto>feiYongIdList;
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/dfDto/createMenZhenFyDto.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/dfDto/CreateMenZhenFyDto.java
similarity index 90%
rename from ltkj-hosp/src/main/java/com/ltkj/hosp/dfDto/createMenZhenFyDto.java
rename to ltkj-hosp/src/main/java/com/ltkj/hosp/dfDto/CreateMenZhenFyDto.java
index d5d0bf8..edf71f5 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/dfDto/createMenZhenFyDto.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/dfDto/CreateMenZhenFyDto.java
@@ -13,7 +13,7 @@
*/
@Data
-public class createMenZhenFyDto {
+public class CreateMenZhenFyDto {
//鐥呬汉Id(鍦℉IS涓殑鍞竴鐮�)
private String bingRenId;
@@ -32,7 +32,7 @@
//鏀堕��鏍囧織(1:鐢熸垚寰呮敹璐�, 2鐢熸垚寰呴��璐�)
private String shouTuiBz;
//璐圭敤鏄庣粏
- private List<feiYongMxDto> feiYongMxList;
+ private List<FeiYongMxDto> feiYongMxList;
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/dfDto/FeiYongIdDto.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/dfDto/FeiYongIdDto.java
new file mode 100644
index 0000000..05a3513
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/dfDto/FeiYongIdDto.java
@@ -0,0 +1,16 @@
+package com.ltkj.hosp.dfDto;
+
+import lombok.Data;
+
+/**
+ * ClassName: FeiYongIdDto <br/>
+ * Description: <br/>
+ * date: 2024/12/10 20:16<br/>
+ *
+ * @author zjh<br />
+ */
+@Data
+public class FeiYongIdDto {
+ //璐圭敤Id
+ private String feiYongId;
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/dfDto/feiYongMxDto.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/dfDto/FeiYongMxDto.java
similarity index 91%
rename from ltkj-hosp/src/main/java/com/ltkj/hosp/dfDto/feiYongMxDto.java
rename to ltkj-hosp/src/main/java/com/ltkj/hosp/dfDto/FeiYongMxDto.java
index 62555c1..ce82525 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/dfDto/feiYongMxDto.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/dfDto/FeiYongMxDto.java
@@ -1,7 +1,6 @@
package com.ltkj.hosp.dfDto;
import lombok.Data;
-import org.apache.poi.hpsf.Decimal;
import java.math.BigDecimal;
@@ -13,7 +12,7 @@
* @author zjh<br />
*/
@Data
-public class feiYongMxDto {
+public class FeiYongMxDto {
//璐圭敤鏄庣粏Id(閫�璐瑰繀浼�)
private String feiYongMxId;
//璐圭敤Id(閫�璐瑰繀浼�)
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjAsyncService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjAsyncService.java
index 0e77f1c..beb51f9 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjAsyncService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjAsyncService.java
@@ -106,4 +106,5 @@
void addTjChargingStandard(TjOrder order, List<TbTransition> tbTransitionList, SysUser sysUser);
+ void tjUpdateDetatilByVi(String s);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java
index f212620..58d9810 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java
@@ -156,6 +156,7 @@
@Override
public List<TreeSelect> selectProjectTreeList(TjProject tjProject) {
LambdaQueryWrapper<TjProject> wq=new LambdaQueryWrapper<>();
+ wq.eq(TjProject::getProStatus,0);
List<TjProject> projects = SpringUtils.getAopProxy(this).list(wq);
return buildProjectTreeSelect(projects);
}
diff --git a/ltkj-hosp/src/main/resources/mapper/TestMapper.xml b/ltkj-hosp/src/main/resources/mapper/TestMapper.xml
index e26091f..7b3acd9 100644
--- a/ltkj-hosp/src/main/resources/mapper/TestMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/TestMapper.xml
@@ -8,8 +8,8 @@
<select id="tjUpdateDetatilByVi" parameterType="java.util.Map" statementType="CALLABLE">
{call tj_update_detatil_by_vi(
- #{tjNumber,mode=IN,jdbcType=VARCHAR}
+ #{tjnum,mode=IN,jdbcType=VARCHAR}
)}
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.8.0