From 1ea4e6b1fce036ba234c9f21c69e9fd68649abb2 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期三, 05 六月 2024 18:45:22 +0800
Subject: [PATCH] zjh 本地 2024/06/05 --2
---
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java | 20 ++++++++++
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethodService.java | 2
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java | 51 +++++++++++++++++++++----
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java | 14 +++++++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java | 6 +++
5 files changed, 84 insertions(+), 9 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
index b3f55ee..dfc1860 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
@@ -1,7 +1,6 @@
package com.ltkj.web.controller.his;
-
import cn.hutool.core.date.DateUtil;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
@@ -10,6 +9,7 @@
import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.common.utils.SecurityUtils;
import com.ltkj.hosp.domain.TjCustomer;
+import com.ltkj.hosp.domain.TjOrder;
import com.ltkj.hosp.domain.TjOrderDetail;
import com.ltkj.hosp.domain.TjProject;
import com.ltkj.hosp.hisDto.OutpinexamapplyDto;
@@ -59,10 +59,10 @@
return result.get("data").toString();
}
- //瀵规帴his鎬绘帴鍙�
+ //瀵规帴his鎬绘帴鍙� 娉ㄥ唽鎸傚彿鎺ヨ瘖鐢宠鍗曟搷浣�
@Transactional
public void HisApiMethods(TjCustomer customer, Long orderId) {
- HisApiGetMethodService hisApiGetMethodService=new HisApiGetMethodService();
+ HisApiGetMethodService hisApiGetMethodService = new HisApiGetMethodService();
Date dates = new Date();
final String date = DateUtil.format(dates, "yyyy-MM-dd HH:mm:ss");
@@ -147,9 +147,11 @@
String code3 = object3.getStr("ResultCode");
if (code3.equals("0")) {
Map<String, Object> datas = object3.getJSONObject("ResultData");
- datas.put("cardId",hisRegistrationId);
+ datas.put("cardId", hisRegistrationId);
JSONObject object4 = JSONUtil.parseObj(datas);
- hisApiGetMethodService.save(object4,"Outpintestapply");
+ if(null ==orderService.getHuoQuJysqdh(hisRegistrationId)){
+ hisApiGetMethodService.save(object4, "Outpintestapply");
+ }
//闂ㄨ瘖妫�鏌ョ敵璇�
OutpinexamapplyDto outpinexamapplyDto = new OutpinexamapplyDto();
outpinexamapplyDto.setHisRegistrationId(hisRegistrationId);
@@ -179,11 +181,12 @@
String result6 = getAjaxResult(ajaxResult2);
JSONObject object5 = getJSONObject(result6);
String code4 = object5.getStr("ResultCode");
- if(code4.equals("0")){
+ if (code4.equals("0")) {
Map<String, Object> map = object5.getJSONObject("ResultData");
- map.put("cardId",hisRegistrationId);
+ map.put("cardId", hisRegistrationId);
JSONObject jsonObject = JSONUtil.parseObj(map);
- hisApiGetMethodService.save(jsonObject,"Outpinexamapply");
+ if(null ==orderService.getHuoQuJcsqdh(hisRegistrationId))
+ hisApiGetMethodService.save(jsonObject, "Outpinexamapply");
}
}
}
@@ -198,4 +201,36 @@
}
}
+
+ //閫�璐瑰悗鍙栨秷鎺ヨ瘖浣滃簾鐢宠鍗曠瓑鎿嶄綔
+ @Transactional
+ public void ZfHisApiMethods(TjCustomer customer, TjOrder order) {
+ Date dates = new Date();
+ final String date = DateUtil.format(dates, "yyyy-MM-dd HH:mm:ss");
+
+ String jcsqdh= orderService.getHuoQuJcsqdh(order.getCardId());
+
+ String jysqdh= orderService.getHuoQuJysqdh(order.getCardId());
+
+ //浣滃簾闂ㄨ瘖妫�鏌ョ敵璇�
+ AjaxResult result = controller.Outpindelexamapply(order.getCardId(), "00029", jcsqdh);
+ String result1 = getAjaxResult(result);
+ JSONObject object = getJSONObject(result1);
+ String code = object.getStr("ResultCode");
+ if(code.equals("0")){
+ orderService.delHuoQuJcsqdh(order.getCardId());
+ }
+
+ //浣滃簾闂ㄨ瘖鐢宠
+ AjaxResult ajaxResult = controller.Outpindeltestapply(order.getCardId(), "00029", jysqdh);
+ String result2 = getAjaxResult(ajaxResult);
+ JSONObject object1 = getJSONObject(result2);
+ String code1 = object1.getStr("ResultCode");
+ if(code1.equals("0")){
+ orderService.delHuoQuJysqdh(order.getCardId());
+ }
+
+ controller.Outpinunconapply(order.getCardId(),date,"00029");
+
+ }
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethodService.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethodService.java
index 05fb941..65892c6 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethodService.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethodService.java
@@ -102,7 +102,7 @@
// @ApiOperation(value = "闂ㄨ瘖鍖荤敓鍙栨秷鎺ヨ瘖")
public AjaxResult Outpinunconapply (String jzh,
- Date jzrq,
+ String jzrq,
String jzysbm) {
Map<String, Object> map = new HashMap<> ();
map.put ("his_registration_id", jzh);
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 6f92c49..6ed856c 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
@@ -8,6 +8,7 @@
import com.ltkj.hosp.domain.TjCustomer;
import com.ltkj.hosp.domain.TjOrder;
import com.ltkj.hosp.vodomain.LineChartsVo;
+import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -227,4 +228,17 @@
" left join dict_comp d on d.drug_manufacturer_id = c.firm_id\n" +
"where c.tj_number=#{tjNumber}")
Map<String ,Object > selectDjdUserInfo(@Param("tjNumber")String tjNumber);
+
+
+ @Select("SELECT a.jcsqdh FROM ltkj_outpinexamapply a WHERE a.cardId=#{cardId}")
+ String getHuoQuJcsqdh(String cardId);
+ @Delete("DELETE FROM ltkj_outpinexamapply WHERE cardId=#{cardId}")
+ String delHuoQuJcsqdh(String cardId);
+
+
+
+ @Select("SELECT a.jysqdh FROM ltkj_outpintestapply a WHERE a.cardId='20240604000001'")
+ String getHuoQuJysqdh(String cardId);
+ @Delete("DELETE FROM ltkj_outpintestapply WHERE cardId=#{cardId}")
+ String delHuoQuJysqdh(String cardId);
}
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 f17fdbd..aeed721 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
@@ -138,4 +138,10 @@
List<Map<String ,String >> selectDjdInfo(String tjNumber);
Map<String ,Object > selectDjdUserInfo(String tjNumber);
+
+ String getHuoQuJcsqdh(String cardId);
+ String delHuoQuJcsqdh(String cardId);
+
+ String getHuoQuJysqdh(String cardId);
+ String delHuoQuJysqdh(String cardId);
}
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 e033aea..8de9e22 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
@@ -283,4 +283,24 @@
public Map<String, Object> selectDjdUserInfo(String tjNumber) {
return tjOrderMapper.selectDjdUserInfo(tjNumber);
}
+
+ @Override
+ public String getHuoQuJcsqdh(String cardId) {
+ return tjOrderMapper.getHuoQuJcsqdh(cardId);
+ }
+
+ @Override
+ public String delHuoQuJcsqdh(String cardId) {
+ return tjOrderMapper.delHuoQuJcsqdh(cardId);
+ }
+
+ @Override
+ public String getHuoQuJysqdh(String cardId) {
+ return tjOrderMapper.getHuoQuJysqdh(cardId);
+ }
+
+ @Override
+ public String delHuoQuJysqdh(String cardId) {
+ return tjOrderMapper.delHuoQuJysqdh(cardId);
+ }
}
--
Gitblit v1.8.0