From da9cb628948b381015faf188283a90a3aa15ce62 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 10 十二月 2024 19:52:55 +0800
Subject: [PATCH] zjh202412010
---
ltkj-admin/src/main/java/com/ltkj/web/controller/dongfanghis/DfHisApiMethodService.java | 176 ++++++++++++++++++++++
ltkj-hosp/src/main/java/com/ltkj/hosp/dfDto/createMenZhenFyDto.java | 38 ++++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java | 17 ++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 1
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 1
ltkj-admin/src/main/java/com/ltkj/web/wxUtils/HttpClientUtils.java | 45 +++++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java | 14 +
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java | 3
ltkj-hosp/src/main/resources/mapper/hosp/TjOrderRemarkMapper.xml | 16 ++
ltkj-hosp/src/main/java/com/ltkj/hosp/dfDto/feiYongMxDto.java | 35 ++++
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java | 7
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java | 3
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java | 14
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 5
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java | 3
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java | 16 +
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java | 4
ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml | 12 +
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjRules.java | 7
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java | 13 +
ltkj-admin/src/main/java/com/ltkj/web/controller/dongfanghis/DfHisApiMethod.java | 17 ++
21 files changed, 426 insertions(+), 21 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/dongfanghis/DfHisApiMethod.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/dongfanghis/DfHisApiMethod.java
new file mode 100644
index 0000000..2ad474f
--- /dev/null
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/dongfanghis/DfHisApiMethod.java
@@ -0,0 +1,17 @@
+package com.ltkj.web.controller.dongfanghis;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * ClassName: HisApiMethod <br/>
+ * Description: <br/>
+ * date: 2024/12/10 08:51<br/>
+ *
+ * @author zjh<br />
+ */
+@Slf4j
+@Component
+public class DfHisApiMethod {
+
+}
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
new file mode 100644
index 0000000..fc5722e
--- /dev/null
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/dongfanghis/DfHisApiMethodService.java
@@ -0,0 +1,176 @@
+package com.ltkj.web.controller.dongfanghis;
+
+import cn.hutool.core.date.DateUtil;
+import com.ltkj.common.core.domain.AjaxResult;
+import com.ltkj.hosp.domain.TjCustomer;
+import com.ltkj.web.wxUtils.HttpClientUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Component;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+/**
+ * ClassName: DfHisApiMethodService <br/>
+ * Description: <br/>
+ * date: 2024/12/10 09:24<br/>
+ *
+ * @author zjh<br />
+ */
+
+@Component
+@Slf4j
+public class DfHisApiMethodService {
+
+ private static String HIS_URL = "";
+
+ private static String CONFIG_PATH;
+
+ private static String GRANT_TYPE = "";
+ private static String CLIENT_ID = "";
+ private static String CLIENT_SECRET = "";
+ private static String SCOP = "";
+
+// @Autowired
+// private RedisTemplate<String,Object> redisTemplate;
+
+ @Value("${config.properties}")
+ public void setConfigPath(String configPath) {
+ CONFIG_PATH = configPath;
+ try {
+ FileInputStream inputStream = new FileInputStream(CONFIG_PATH);
+ Properties props = new Properties();
+ props.load(inputStream);
+ String url = props.getProperty("df_his_api_url");
+ String port = props.getProperty("df_his_api_port");
+ GRANT_TYPE = props.getProperty("grant_type");
+ CLIENT_ID= props.getProperty("client_id");
+ CLIENT_SECRET = props.getProperty("client_secret");
+ SCOP = props.getProperty("scope");
+ HIS_URL=url+":"+port+"/OAPI/";
+ } catch (IOException throwables) {
+ throwables.printStackTrace();
+ }
+ }
+
+
+ //鑾峰彇token
+ public AjaxResult getToken () {
+ Map<String, Object> map = new HashMap<>();
+ map.put("grant_type",GRANT_TYPE);
+ map.put("client_id",CLIENT_ID);
+ map.put("client_secret",CLIENT_SECRET);
+ map.put("scope",SCOP);
+ String post = HttpClientUtils.sendPost (HIS_URL+"/oauth/token", map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+ //寤烘。
+ public AjaxResult jianDang (TjCustomer customer) {
+ 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);
+ }else if(cusSex==1L){
+ map.put ("xingBie",2);
+ }else {
+ map.put ("xingBie",9);
+ }
+ map.put ("shenFenZh", customer.getCusIdcard ());
+ map.put ("danWeiBh","");
+ map.put ("chuShengRq", DateUtil.format(customer.getCusBrithday(),"yyyy-MM-dd"));
+ map.put ("lianXiDz", customer.getCusAddr());
+ map.put ("lianXiDh", customer.getCusPhone ());
+ map.put ("feiYongLb","");
+ map.put ("feiYongXz","");
+ map.put ("jiLuLy","3");
+ map.put ("caoZuoYuan","1088");
+ map.put ("chongZhiJe","");
+ map.put ("yiBaoKh","");
+ map.put ("geRenBh","");
+ map.put ("yiBaoBrXx","");
+ map.put ("gongZuoDw",customer.getCompName());
+ map.put ("canBaoXzMc","");
+ map.put ("muLuBlLb","");
+ map.put ("kunNanJzDj","");
+ map.put ("yiLiaoLb","");
+ map.put ("minZuDm","");
+ map.put ("minZuMc","");
+ //鑱屼笟缂栫爜
+ String post = HttpClientUtils.sendPost (HIS_URL+"/menZhenJz/jianDang", map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+ //楠岃瘉韬唤璇佹槸鍚﹀缓杩囨。
+ public AjaxResult getBingRenXxByShengFenZheng (TjCustomer customer) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("caoZuoYuan","1088");
+ map.put ("shenFenZh", customer.getCusIdcard ());
+ map.put ("danWeiBh","");
+ //鑱屼笟缂栫爜
+ String post = HttpClientUtils.sendPost (HIS_URL+"/menZhenJz/getBingRenXxByShengFenZheng", map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+ //鐥呬汉鍩烘湰淇℃伅鍙樻洿
+ public AjaxResult saveBingRenXx (TjCustomer customer) {
+ 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);
+ }else if(cusSex==1L){
+ map.put ("xingBie",2);
+ }else {
+ map.put ("xingBie",9);
+ }
+ map.put ("shenFenZh", customer.getCusIdcard ());
+ map.put ("danWeiBh","");
+ map.put ("chuShengRq", DateUtil.format(customer.getCusBrithday(),"yyyy-MM-dd"));
+ map.put ("lianXiDz", customer.getCusAddr());
+ map.put ("lianXiDh", customer.getCusPhone ());
+ map.put ("feiYongLb","");
+ map.put ("feiYongXz","");
+ map.put ("jiLuLy","3");
+ map.put ("caoZuoYuan","1088");
+ //鑱屼笟缂栫爜
+ String post = HttpClientUtils.sendPost (HIS_URL+"/menZhenJz/saveBingRenXx", map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+ //寰呮敹璐硅垂鐢ㄦ煡璇�
+ public AjaxResult getListDaiShouFei (String bingRenId,String jiuZhenKh,String yuanQuId) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("bingRenId",bingRenId);
+ map.put ("jiuZhenKh",jiuZhenKh);
+ map.put ("yuanQuId",yuanQuId);
+ //鑱屼笟缂栫爜
+ String post = HttpClientUtils.sendPost (HIS_URL+"/shouFei/getListDaiShouFei", map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+
+ //寰呮敹璐硅垂鐢ㄦ煡璇�
+ public AjaxResult createMenZhenFy (String bingRenId,String jiuZhenKh,String yuanQuId) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("bingRenId",bingRenId);
+ map.put ("jiuZhenKh",jiuZhenKh);
+ map.put ("yuanQuId",yuanQuId);
+ //鑱屼笟缂栫爜
+ String post = HttpClientUtils.sendPost (HIS_URL+"/shouFei/createMenZhenFy", map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+
+}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
index 17ce7be..5e184ce 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -1394,9 +1394,10 @@
asyncService.getOrderDetailByProParentId(orderRemark.getTjNumber(),null, String.valueOf(orderRemark.getProId()));
return AjaxResult.success("鎿嶄綔鎴愬姛");
}
- asyncService.updateCheckType(orderRemark.getTjNumber());
- asyncService.getOrderDetailByProParentId(orderRemark.getTjNumber(),null, String.valueOf(orderRemark.getProId()));
+// asyncService.updateCheckType(orderRemark.getTjNumber());
+// asyncService.getOrderDetailByProParentId(orderRemark.getTjNumber(),null, String.valueOf(orderRemark.getProId()));
}
+ remarkService.tjYishengjianchajianyi(null,null,null,null);
return AjaxResult.success("鎿嶄綔鎴愬姛");
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java
index f2298b9..517cf9f 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java
@@ -25,6 +25,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import jodd.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -194,6 +195,8 @@
@GetMapping("/list")
@ApiOperation(value = "浣撴寤鸿鍒楄〃鏌ヨ")
public AjaxResult list(@RequestParam(required = false) @ApiParam(value = "椤圭洰鍚�") String proName,
+ @ApiParam(value = "鏍囬") @RequestParam(required = false) String bt,
+ @ApiParam(value = "寤鸿") @RequestParam(required = false) String nr,
@ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer page,
@ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize) {
Page<TjAdvice> page1 = new Page<>(page, pageSize);
@@ -205,16 +208,16 @@
list = new ArrayList<>();
wq.like(TjProject::getProName, proName);
List<TjProject> projectList = tjProjectService.list(wq);
- if (null != projectList && projectList.size() > 0) {
+ if (null != projectList && !projectList.isEmpty()) {
for (TjProject project : projectList) {
LambdaQueryWrapper<TjAdvice> wqq = new LambdaQueryWrapper<>();
wqq.eq(TjAdvice::getProId, project.getProId());
IPage<TjAdvice> adviceList = tjAdviceService.page(page1, wqq);
- if (null != adviceList.getRecords() && adviceList.getRecords().size() > 0) {
+ if (null != adviceList.getRecords() && !adviceList.getRecords().isEmpty()) {
for (TjAdvice record : adviceList.getRecords()) {
record.setProName(project.getProName());
String kjbq = record.getKjbq();
- if(null !=kjbq && !kjbq.equals("")){
+ if(null !=kjbq && !kjbq.isEmpty()){
String[] split = kjbq.split(",");
record.setKjbqz(Arrays.asList(split));
}
@@ -228,9 +231,12 @@
map.put("total", total);
return AjaxResult.success(map);
}
- Page<TjAdvice> page2 = tjAdviceService.page(page1);
+ LambdaQueryWrapper<TjAdvice> wq=new LambdaQueryWrapper<>();
+ if(!StringUtil.isBlank(bt)) wq.like(TjAdvice::getTitle,bt);
+ if(!StringUtil.isBlank(nr)) wq.like(TjAdvice::getAdvice,nr);
+ Page<TjAdvice> page2 = tjAdviceService.page(page1,wq);
list = page2.getRecords();
- if (null != list && list.size() > 0) {
+ if (null != list && !list.isEmpty()) {
for (TjAdvice advice : list) {
TjProject tjProject = tjProjectService.getById(advice.getProId());
if (null != tjProject) {
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 fcbd62b..f8f75d5 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
@@ -667,6 +667,7 @@
testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
}
//妫�鏌�
+ orderService.tjLispacstongbujianyi(null,null,null,null);
return AjaxResult.success("鍚屾鎴愬姛");
}
return AjaxResult.error("鏈煡鍒拌浜哄憳浣撴璁板綍");
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index 71287d4..5c04915 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -997,6 +997,7 @@
AjaxResult result = processOrderWithTransaction(tjOrder, tjCustomer, tjReservation, tjFlowingWater, mallOrder, sysUser);
if (!result.get("code").toString().equals("200"))
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ tjOrderService.tjQiandaodengji(tjOrder.getTjNumber());
return result;
}
} finally {
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
index d83d19a..67163a4 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
@@ -346,7 +346,7 @@
LambdaQueryWrapper<TjPackageProject> wq1 = new LambdaQueryWrapper<>();
wq1.eq(TjPackageProject::getProId, tjProject.getProId());
List<TjPackageProject> list1 = ppservice.list(wq1);
- if (null != list1 && list1.size() > 0) {
+ if (null != list1 && !list1.isEmpty()) {
return AjaxResult.error("璇ラ」鐩鍦ㄥ椁愪腑浣跨敤,鏆傛椂涓嶈兘鍋滅敤");
}
}
@@ -374,7 +374,7 @@
}
}
List<TjProject> list = tjProjectService.getTjProjectListBySoneId(String.valueOf(tjProject.getProId()));
- if (null != list && list.size() > 0) {
+ if (null != list && !list.isEmpty()) {
for (TjProject project : list) {
project.setDeptId(tjProject.getDeptId());
project.setProType(tjProject.getProType());
@@ -385,7 +385,7 @@
}
}
List<TjConsumables> consumablesList = tjProject.getConsumablesList();
- if (null != consumablesList && consumablesList.size() > 0) {
+ if (null != consumablesList && !consumablesList.isEmpty()) {
LambdaQueryWrapper<TjProConsumables> wq = new LambdaQueryWrapper<>();
wq.eq(TjProConsumables::getProId, tjProject.getProId());
proConsumablesService.remove(wq);
@@ -426,7 +426,7 @@
}
}
List<TjStandard> tjStandardList = tjProject.getTjStandardList();
- if (null != tjStandardList && tjStandardList.size() > 0) {
+ if (null != tjStandardList && !tjStandardList.isEmpty()) {
for (TjStandard tjStandard : tjStandardList) {
if (null == tjStandard.getTjSex()) {
tjStandard.setTjSex(null);
@@ -442,8 +442,10 @@
if (null != proParentId) {
LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
wq.eq(TjProject::getProParentId, proParentId);
- List<TjProject> projectList = tjProjectService.list(wq);
- if (null != projectList && projectList.size() > 0) {
+ wq.eq(TjProject::getProStatus,0);
+// List<TjProject> projectList = tjProjectService.list(wq);
+ List<TjProject> projectList = tjProjectService.getTjProjectListBySoneId(String.valueOf(proParentId));
+ if (null != projectList && !projectList.isEmpty()) {
BigDecimal bigDecimal = new BigDecimal("0.00");
for (TjProject project : projectList) {
bigDecimal = bigDecimal.add(project.getProPrice());
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
index 61b2f1f..1cb65eb 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
@@ -697,7 +697,8 @@
TjReservation reservation = tjReservationService.getById(id);
if (null != reservation && reservation.getIsExpire() == 2) {
if (tjReservationService.removeById(id)) {
- transitionService.remove(new LambdaQueryWrapper<TbTransition>().eq(TbTransition::getCusId, reservation.getIdCard()));
+ transitionService.remove(new LambdaQueryWrapper<TbTransition>().eq(TbTransition::getCusId, reservation.getIdCard())
+ .isNull(TbTransition::getTjNum));
taskService.removeTask(new TjReservationTask(id));
}
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/wxUtils/HttpClientUtils.java b/ltkj-admin/src/main/java/com/ltkj/web/wxUtils/HttpClientUtils.java
index 2299525..be48f86 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/wxUtils/HttpClientUtils.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/wxUtils/HttpClientUtils.java
@@ -346,4 +346,49 @@
}
+
+ public static String sendPost(String httpUrl, Map<String, Object> maps,String token) {
+
+ try {
+ // 1. 鍒涘缓 URL 瀵硅薄
+ URL url = new URL(httpUrl);
+ // 2. 鍒涘缓 HttpURLConnection 瀵硅薄
+ HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+ // 3. 璁剧疆璇锋眰鏂规硶涓� POST
+ connection.setRequestMethod("POST");
+ // 4. 璁剧疆 Content-Type 澶撮儴瀛楁
+ connection.setRequestProperty("Content-Type", "application/json;charset=UTF-8");
+ //璁剧疆璇锋眰token
+ connection.setRequestProperty("Authorization",token);
+ // 6. 鍚戞湇鍔″櫒鍙戦�佹暟鎹�
+ String requestBody = JSONUtil.toJsonStr(maps);
+ log.info(httpUrl+"鍏ュ弬: "+requestBody);
+// String requestBody1 = maps.toString();
+ byte[] postData = requestBody.getBytes("UTF-8");
+ connection.setDoOutput(true);
+ try (OutputStream outputStream = connection.getOutputStream()) {
+ outputStream.write(postData);
+ }
+
+ // 8. 鑾峰彇鍝嶅簲鏁版嵁
+ try (BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream(), StandardCharsets.UTF_8))) {
+ String line;
+ StringBuilder response = new StringBuilder();
+ while ((line = reader.readLine()) != null) {
+ response.append(line);
+ }
+ log.info("=====================================================");
+ log.info(httpUrl+"鍑哄弬");
+ log.info(response.toString());
+ connection.disconnect();
+ return response.toString();
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ return null;
+ }
+
+
}
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
new file mode 100644
index 0000000..d5d0bf8
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/dfDto/createMenZhenFyDto.java
@@ -0,0 +1,38 @@
+package com.ltkj.hosp.dfDto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * ClassName: createMenZhenFyDto <br/>
+ * Description: <br/>
+ * date: 2024/12/10 11:57<br/>
+ *
+ * @author zjh<br />
+ */
+
+@Data
+public class createMenZhenFyDto {
+
+ //鐥呬汉Id(鍦℉IS涓殑鍞竴鐮�)
+ private String bingRenId;
+ //灏辫瘖鍗″彿
+ private String jiuZhenKh;
+ //鎿嶄綔鍛�(鏀惰垂浜哄憳/浣撴/鑷姪鏈�)
+ private String caoZuoYuan;
+ //闄㈠尯Id
+ private String yuanQuId;
+ //搴旂敤Id锛堣嚜鍔╂満浼�010101锛屼綋妫� 870101锛�
+ private String yingYongId;
+ //寮�鍗曠瀹�
+ private String kaiDanKs;
+ //鐧昏娴佹按鍙�
+ private String dengJiLsh;
+ //鏀堕��鏍囧織(1:鐢熸垚寰呮敹璐�, 2鐢熸垚寰呴��璐�)
+ private String shouTuiBz;
+ //璐圭敤鏄庣粏
+ private List<feiYongMxDto> feiYongMxList;
+
+
+}
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
new file mode 100644
index 0000000..62555c1
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/dfDto/feiYongMxDto.java
@@ -0,0 +1,35 @@
+package com.ltkj.hosp.dfDto;
+
+import lombok.Data;
+import org.apache.poi.hpsf.Decimal;
+
+import java.math.BigDecimal;
+
+/**
+ * ClassName: feiYongMxDto <br/>
+ * Description: <br/>
+ * date: 2024/12/10 11:57<br/>
+ *
+ * @author zjh<br />
+ */
+@Data
+public class feiYongMxDto {
+ //璐圭敤鏄庣粏Id(閫�璐瑰繀浼�)
+ private String feiYongMxId;
+ //璐圭敤Id(閫�璐瑰繀浼�)
+ private String feiYongId;
+ //鏀惰垂椤圭洰Id(HIS鐨�)
+ private String shouFeiXmId;
+ //鏀惰垂椤圭洰鍚嶇О
+ private String shouFeiXmMc;
+ //鏁伴噺(閫�璐逛负璐�)
+ private Integer shuLiang;
+ //鍗曚环
+ private BigDecimal danJia;
+ //缁撶畻閲戦(閫�璐逛负璐�)
+ private BigDecimal jieSuanJe;
+ //鎵ц绉戝
+ private String zhiXingKs;
+ //鎵ц绉戝鍚嶇О
+ private String zhiXingKsMc;
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjRules.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjRules.java
index ee0e453..b796376 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjRules.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjRules.java
@@ -151,6 +151,13 @@
*/
private String groupId;
+ //寤鸿id
+ private String adviceId;
+ //寤鸿鍐呭
+ private String adviceNr;
+ //寤鸿鏍囬
+ private String adviceBt;
+
@TableField(exist = false)
private List<TjRuleAdvice> ruleAdvices;
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 a6affca..ab50501 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
@@ -321,4 +321,11 @@
" AND b.org_type = 2 \n" +
" AND a.type !=1")
List<String> getDingShiTongBuJianChaTjNum();
+
+
+
+
+ void tjQiandaodengji(Map<String,Object> map);
+
+ void tjLispacstongbujianyi(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 9328031..4361813 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
@@ -1,6 +1,7 @@
package com.ltkj.hosp.mapper;
import java.util.List;
+import java.util.Map;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ltkj.hosp.domain.TjOrderRemark;
@@ -179,4 +180,7 @@
@Select("call tj_check_yclist(0,#{tjnumber,mode=IN})")
List<TjOrderRemark> getzongjianyishengchakanyichangxiangmu(String tjNumber);
+
+
+ void tjYishengjianchajianyi(Map<String,Object> map);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java
index 956d744..9fd9c27 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java
@@ -65,14 +65,14 @@
*/
public int deleteTjProjectByProIds(Long[] proIds);
- @Select("SELECT * FROM tj_project WHERE pro_parent_id=#{proId} AND deleted='0'")
+ @Select("SELECT * FROM tj_project WHERE pro_parent_id=#{proId} AND deleted='0' and pro_status=0")
public List<TjProject> getTjProjectListBySoneId(@Param("proId") String proId);
@Select("SELECT * FROM tj_project WHERE pro_id=#{proId} AND deleted='0'")
public TjProject getTjProjectById(@Param("proId") String proId);
- @Select("SELECT GROUP_CONCAT(pro_name ORDER BY pro_name) AS names FROM tj_project WHERE pro_parent_id=#{proId} AND deleted='0' ")
+ @Select("SELECT GROUP_CONCAT(pro_name ORDER BY pro_name) AS names FROM tj_project WHERE pro_parent_id=#{proId} AND deleted='0' and pro_status=0 ")
String appendTjProjectName(String proId);
@Select("SELECT a.pro_id FROM tj_project a WHERE a.dept_id=#{ksId} AND a.pro_status=0 AND a.deleted='0' ")
@@ -88,13 +88,13 @@
String appendTjProjectNames(@Param("proIds")String[] proIds);
- @Select("SELECT GROUP_CONCAT(pro_name ORDER BY pro_name) AS names FROM tj_project WHERE pro_parent_id=#{proId} AND deleted='0' ")
+ @Select("SELECT GROUP_CONCAT(pro_name ORDER BY pro_name) AS names FROM tj_project WHERE pro_parent_id=#{proId} AND deleted='0' and pro_status=0")
String getAllSonNames(String proId);
@Select("SELECT GROUP_CONCAT(c.pro_name ) AS names FROM tj_package a LEFT JOIN tj_package_project b ON a.pac_id=b.pac_id LEFT JOIN tj_project c ON b.pro_id=c.pro_id WHERE a.pac_id=#{pacId}")
String getAllNamesByPacId(String pacId);
- @Select("SELECT sum(pro_price) pro_price FROM tj_project WHERE pro_parent_id=#{proId} AND deleted='0' ")
+ @Select("SELECT sum(pro_price) pro_price FROM tj_project WHERE pro_parent_id=#{proId} AND deleted='0' and pro_status=0 ")
BigDecimal getMoneys(String proId);
@Select("SELECT * FROM tj_project WHERE pro_id=#{proId} AND pro_parent_id='0' AND deleted='0' ")
@@ -132,7 +132,7 @@
")) aa LEFT JOIN tj_project c ON aa.pro_id=c.pro_id ")
List<TjProject> getTjProListByPacIdAndDeptId(String pacId);
- @Select("SELECT * FROM `tj_project` where pro_parent_id=#{proId}")
+ @Select("SELECT * FROM `tj_project` where pro_parent_id=#{proId} and pro_status=0")
List<TjProject> getAllChildListById(String proId);
@Select("SELECT * FROM `tj_project` where pro_parent_id=0 and pro_status=0")
@@ -152,10 +152,10 @@
List<TjProject> getPacTjProjectList();
- @Select("SELECT a.pro_id FROM tj_project a JOIN sys_dept b ON a.dept_id=b.dept_id WHERE a.deleted=0 AND b.parent_org_code='A30' AND a.need_report='Y'")
+ @Select("SELECT a.pro_id FROM tj_project a JOIN sys_dept b ON a.dept_id=b.dept_id WHERE a.deleted=0 AND b.parent_org_code='A30' AND a.need_report='Y' and a.pro_status=0")
List<Long> getHuaYanProId();
- @Select("SELECT a.pro_id FROM tj_project a JOIN sys_dept b ON a.dept_id=b.dept_id WHERE a.deleted=0 AND b.parent_org_code='A32' AND a.need_report='Y'")
+ @Select("SELECT a.pro_id FROM tj_project a JOIN sys_dept b ON a.dept_id=b.dept_id WHERE a.deleted=0 AND b.parent_org_code='A32' AND a.need_report='Y' and a.pro_status=0")
List<Long> getYingXiangProId();
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 4420515..65862a4 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
@@ -9,6 +9,7 @@
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
+import javax.validation.constraints.Size;
import java.util.List;
/**
@@ -70,4 +71,6 @@
List<TjOrderRemark> getzongjianyishengchakanyichangxiangmu(String tjNumber);
List<TjOrderRemark> pacsJianChaData(String tjnumber);
+
+ void tjYishengjianchajianyi(String tjNumber, Long deptId,String nickName, Long userId);
}
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 a41b75d..10ab10d 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
@@ -181,4 +181,7 @@
List<String> getDingShiTongBuJianChaTjNum();
+ 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/impl/TjOrderRemarkServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java
index 4419c1e..27cf338 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
@@ -10,7 +10,9 @@
import javax.annotation.Resource;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* 鍖荤敓澶囨敞Service涓氬姟灞傚鐞�
@@ -128,4 +130,15 @@
return mapper.pacsJianChaData(tjnumber);
}
+ @Override
+ public void tjYishengjianchajianyi(String tjNumber, Long deptId, String nickName, Long userId) {
+
+ Map<String,Object> map=new HashMap<>();
+ map.put("tjNum",tjNumber);
+ map.put("ksId",deptId.toString());
+ map.put("ysxm",nickName);
+ map.put("ysid",userId.toString());
+ mapper.tjYishengjianchajianyi(map);
+ }
+
}
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 90e3652..98eef40 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
@@ -403,4 +403,21 @@
public List<String> getDingShiTongBuJianChaTjNum() {
return tjOrderMapper.getDingShiTongBuJianChaTjNum();
}
+
+ @Override
+ public void tjQiandaodengji(String tjNum) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("tjNum",tjNum);
+ tjOrderMapper.tjQiandaodengji(map);
+ }
+
+ @Override
+ public void tjLispacstongbujianyi(String tjNumber, Long deptId, String nickName, Long userId) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("tjNum",tjNumber);
+ map.put("ksId",deptId.toString());
+ map.put("ysxm",nickName);
+ map.put("ysid",userId.toString());
+ tjOrderMapper.tjLispacstongbujianyi(map);
+ }
}
diff --git a/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml b/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml
index 88213d3..c9e7503 100644
--- a/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml
@@ -383,5 +383,17 @@
#{total,mode=OUT,jdbcType=INTEGER}
)}
</select>
+ <select id="tjQiandaodengji" parameterType="java.util.Map" statementType="CALLABLE" resultType="java.util.Map">
+ {call tj_qiandaodengji(
+ #{tjNum,mode=IN,jdbcType=VARCHAR}
+ )}
+ </select>
+ <select id="tjLispacstongbujianyi" parameterType="java.util.Map" statementType="CALLABLE" resultType="java.util.Map">
+ {call tj_lispacstongbujianyi(
+ #{tjNum,mode=IN,jdbcType=VARCHAR},
+ #{ksId,mode=IN,jdbcType=VARCHAR},
+ #{ysxm,mode=IN,jdbcType=VARCHAR},
+ #{ysid,mode=IN,jdbcType=VARCHAR} )}
+ </select>
</mapper>
diff --git a/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderRemarkMapper.xml b/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderRemarkMapper.xml
new file mode 100644
index 0000000..aeaab55
--- /dev/null
+++ b/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderRemarkMapper.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ltkj.hosp.mapper.TjOrderRemarkMapper">
+
+ <select id="tjYishengjianchajianyi" parameterType="java.util.Map" statementType="CALLABLE" resultType="java.util.Map">
+ {call tj_yishengjianchajianyi(
+ #{tjNum,mode=IN,jdbcType=VARCHAR},
+ #{ksId,mode=IN,jdbcType=VARCHAR},
+ #{ysxm,mode=IN,jdbcType=VARCHAR},
+ #{ysid,mode=IN,jdbcType=VARCHAR}
+ )}
+ </select>
+
+</mapper>
--
Gitblit v1.8.0