From b8bf9a10ca1c65e94d75a2db5550e6263b582512 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期一, 16 十二月 2024 15:01:41 +0800
Subject: [PATCH] 调整结果项目状态判断结论增加非空判断
---
ltkj-admin/src/main/java/com/ltkj/web/controller/dongfanghis/DfHisApiMethodService.java | 212 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 199 insertions(+), 13 deletions(-)
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..0644767 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;
@@ -13,6 +16,7 @@
import java.io.FileInputStream;
import java.io.IOException;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -27,6 +31,9 @@
@Component
@Slf4j
public class DfHisApiMethodService {
+
+ @Autowired
+ private ISysConfigService configService;
private static String HIS_URL = "";
@@ -73,17 +80,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 +102,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 +121,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 +133,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 +154,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 +173,190 @@
//寰呮敹璐硅垂鐢ㄦ煡璇�
- 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);
+ }
+
+
+
+ /**
+ *绉戝淇℃伅鎺ㄩ��
+ * @param xingZhiSx 缁勭粐灞炴�� 绗竴浣�1聽琛ㄧず 鎸傚彿
+ * 绗簩浣� 1琛ㄧず涓村簥
+ * 绗笁浣� 1琛ㄧず妫�鏌�
+ * 绗洓浣� 1 琛ㄧず鎵嬫湳
+ * 绗簲浣� 1 琛ㄧず娌荤枟
+ * 绗叚浣� 1 琛ㄧず鎶ょ悊
+ * @param queryString 妯＄硦鍖归厤杈撯紛鐮�1銆佺瀹ゅ悕绉�
+ * @param zuoFeiBz 浣滃簾鏍囧織锛�0 姝ｅ父锛�1 浣滃簾
+ * @param yuanQuId 闄㈠尯id
+ * @param keShiIds 绉戝ID闆嗗悎
+ * @param ifPlus 鏄惁鏌ヨplus灞炴��
+ * @return
+ */
+ public AjaxResult getKeShiByConditions (int xingZhiSx, String queryString, int zuoFeiBz, String yuanQuId, List<String>keShiIds,int ifPlus) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("xingZhiSx",xingZhiSx);
+ map.put ("queryString",queryString);
+ map.put ("zuoFeiBz",zuoFeiBz);
+ map.put ("yuanQuId",yuanQuId);
+ map.put ("keShiIds",keShiIds);
+ map.put ("ifPlus",ifPlus);
+ //鑱屼笟缂栫爜
+ String post = HttpClientUtils.sendPost (HIS_URL+"/zhuShuJu/getKeShiByConditions", map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+
+
+ /**
+ * //鍙栨牱鏈瓧鍏�
+ * @param queryString 鏍锋湰绫诲瀷鍚嶇О(鏍锋湰鍚嶇О/鏍锋湰绫诲瀷id)
+ * @param pageIndex
+ * @param pageSize 姣忊粴鏉℃暟锛堟渶饧や笉鑳借秴杩�100锛�
+ * @return
+ */
+ public AjaxResult getYangBen (String queryString,int pageIndex,int pageSize ) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("queryString",queryString);
+ map.put ("pageIndex",pageIndex);
+ map.put ("pageSize",pageSize);
+ //鑱屼笟缂栫爜
+ String post = HttpClientUtils.sendPost (HIS_URL+"/zhuShuJu/getYangBen", map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+
+ /**
+ * //鐥呭尯淇℃伅鎺ㄩ��
+ * @param yuanQuId 闄㈠尯Id
+ * @param keShiId 绉戝Id
+ * @param pageIndex 褰撳墠饣�
+ * @param pageSize 姣忊粴鏉℃暟锛堟渶饧や笉鑳借秴杩�100锛�
+ * @return
+ */
+ public AjaxResult getListBingQuZd (String yuanQuId,String keShiId,int pageIndex,int pageSize ) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("yuanQuId",yuanQuId);
+ map.put ("keShiId",keShiId);
+ map.put ("pageIndex",pageIndex);
+ map.put ("pageSize",pageSize);
+ //鑱屼笟缂栫爜
+ String post = HttpClientUtils.sendPost (HIS_URL+"/zhuShuJu/getListBingQuZd", map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+ /**
+ * 鑱屸集淇℃伅
+ * @param bianGengSj 鍙樻洿鏃堕棿
+ * @param pageIndex 褰撳墠饣�
+ * @param pageSize 姣忊粴鏉℃暟锛堟渶饧や笉鑳借秴杩�100锛�
+ * @return
+ */
+ public AjaxResult getZhiGongPage (String bianGengSj,int pageIndex,int pageSize ) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("bianGengSj",bianGengSj);
+ map.put ("pageIndex",pageIndex);
+ map.put ("pageSize",pageSize);
+ //鑱屼笟缂栫爜
+ String post = HttpClientUtils.sendPost (HIS_URL+"/zhuShuJu/getZhiGongPage", map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+
+ /**
+ *
+ * @param queryString
+ * @param bianGengSj
+ * @param pageIndex
+ * @param pageSize
+ * @return
+ */
+ public AjaxResult getJianChaXm (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/getJianChaXm", map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+
}
--
Gitblit v1.8.0