From 54180822617097359aa63b48a7cbe3bf1b079caa Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 03 六月 2024 18:10:22 +0800
Subject: [PATCH] zjh 2024/06/03-2
---
ltkj-hosp/src/main/java/com/ltkj/hosp/hisDto/OutpinexamapplyDto.java | 5 +
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 7 ++
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethodService.java | 91 +++++++++++++++++++-----------
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java | 56 +++++++++++++++---
ltkj-admin/src/main/resources/application.yml | 4
5 files changed, 116 insertions(+), 47 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 bc420dc..a869192 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,17 +1,16 @@
package com.ltkj.web.controller.his;
-import cn.hutool.core.date.DateUtil;
+
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.common.utils.SecurityUtils;
-import com.ltkj.framework.config.SecurityConfig;
-import com.ltkj.framework.config.UserHoder;
import com.ltkj.hosp.domain.TjCustomer;
import com.ltkj.hosp.domain.TjOrderDetail;
import com.ltkj.hosp.domain.TjProject;
+import com.ltkj.hosp.hisDto.OutpinexamapplyDto;
import com.ltkj.hosp.hisDto.OutpinregapplyDto;
import com.ltkj.hosp.hisDto.OutpintestapplyDetailsDto;
import com.ltkj.hosp.hisDto.OutpintestapplyDto;
@@ -21,6 +20,7 @@
import com.ltkj.hosp.service.ITjProjectService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.ArrayList;
@@ -57,7 +57,9 @@
}
//瀵规帴his鎬绘帴鍙�
- public AjaxResult HisApiMethods(TjCustomer customer, Long orderId) {
+ @Transactional
+ public void HisApiMethods(TjCustomer customer, Long orderId) {
+ HisApiGetMethodService hisApiGetMethodService=new HisApiGetMethodService();
Date date = new Date();
AjaxResult result = controller.Outpincreateapply(customer);
@@ -91,6 +93,8 @@
if (null != resultDatas && resultDatas.size() > 0) {
String hisRegistrationId = resultDatas.get(0).get("his_registration_id").toString();
if (null != hisRegistrationId) {
+
+ //闂ㄨ瘖妫�楠岀敵璇�
AjaxResult result3 = controller.Outpinconapply(hisRegistrationId, date, SecurityUtils.getUsername());
String result4 = getAjaxResult(result3);
JSONObject object2 = getJSONObject(result4);
@@ -133,11 +137,44 @@
String code3 = object3.getStr("ResultCode");
if (code3.equals("0")) {
Map<String, Object> datas = (Map<String, Object>) object.get("ResultData");
- //妫�楠岀敵璇峰彿锛圧esultData 鏁版嵁闆嗭級
- String jysqdh = data.get("jysqdh").toString();
- //璐圭敤鍚堣
- String fyhj = data.get("fyhj").toString();
-
+ datas.put("cardId",cardId);
+ JSONObject object4 = JSONUtil.parseObj(datas);
+ hisApiGetMethodService.save(object4.toString(),"Outpintestapply");
+ //闂ㄨ瘖妫�鏌ョ敵璇�
+ OutpinexamapplyDto outpinexamapplyDto = new OutpinexamapplyDto();
+ outpinexamapplyDto.setHisRegistrationId(hisRegistrationId);
+ outpinexamapplyDto.setSfzh(customer.getCusIdcard());
+ outpinexamapplyDto.setSqysbm(SecurityUtils.getUsername());
+ outpinexamapplyDto.setMzksbm("");
+ outpinexamapplyDto.setCzybm(SecurityUtils.getUsername());
+ outpinexamapplyDto.setCzyksbm(SecurityUtils.getUsername());
+ List<TjOrderDetail> detailLists = detailService.getTjOrderDetailListByOrderId(orderId.toString());
+ List<OutpintestapplyDetailsDto> detailsDtoss = new ArrayList<>();
+ if (null != detailList && detailList.size() > 0) {
+ LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
+ wq.in(TjProject::getProId, detailLists.stream().map(TjOrderDetail::getProId).collect(Collectors.toList()));
+ List<TjProject> projects = projectService.list(wq);
+ if (null != projects && projects.size() > 0) {
+ for (TjProject project : projects) {
+ OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
+ detailsDto.setMxfyxmbm(project.getHisXmbm());
+ detailsDto.setSfzhfy("1");
+ detailsDto.setSl(1);
+ detailsDtoss.add(detailsDto);
+ }
+ }
+ }
+ outpinexamapplyDto.setDetails(detailsDtoss);
+ AjaxResult ajaxResult2 = controller.Outpinexamapply(outpinexamapplyDto);
+ String result6 = getAjaxResult(ajaxResult2);
+ JSONObject object5 = getJSONObject(result6);
+ String code4 = object5.getStr("ResultCode");
+ if(code4.equals("0")){
+ Map<String, Object> map = (Map<String, Object>) object.get("ResultData");
+ datas.put("cardId",cardId);
+ JSONObject jsonObject = JSONUtil.parseObj(map);
+ hisApiGetMethodService.save(jsonObject.toString(),"Outpinexamapply");
+ }
}
}
}
@@ -149,7 +186,6 @@
}
}
- return AjaxResult.success();
}
}
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 d592742..e1796e6 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
@@ -8,9 +8,16 @@
import com.ltkj.web.wxUtils.HttpClientUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
+import java.util.Properties;
/* @Authot:zjh
@@ -22,7 +29,23 @@
@Autowired
private ITjCustomerService tjCustomerService;
- private static final String HIS_URL = "https://mock.mengxuegu.com/mock/664d3dbce45d2156fa209c80/example/api/His/HisRequest";
+ private static String HIS_URL = "";
+
+ // 鏁版嵁搴撻厤缃枃浠惰矾寰�
+ private static final String CONFIG_PATH = "D:\\ltkjprojectconf\\config.properties";
+
+ static {
+ try {
+ FileInputStream inputStream = new FileInputStream(CONFIG_PATH);
+ Properties props = new Properties();
+ props.load(inputStream);
+ String url = props.getProperty("his_api_url");
+ String port = props.getProperty("his_api_port");
+ HIS_URL=url+":"+port+"/api/His/";
+ } catch (IOException throwables) {
+ throwables.printStackTrace();
+ }
+ }
// @ApiOperation(value = "鏂板/淇敼闂ㄨ瘖娉ㄥ唽淇℃伅")
@@ -53,7 +76,7 @@
map.put ("czy", customer.getCreateBy ());
map.put ("jkkkh", customer.getIndexCard ());
map.put ("mindex_id", customer.getIndexCard ());
- String post = HttpClientUtils.sendPost (HIS_URL, map);
+ String post = HttpClientUtils.sendPost (HIS_URL+"Outpincreateapply", map);
return AjaxResult.success ().put ("data", post);
}
@@ -69,7 +92,7 @@
map.put ("his_registration_id", jzh);
map.put ("jzrq", jzrq);
map.put ("jzysbm", jzysbm);
- String post = HttpClientUtils.sendPost (HIS_URL, map);
+ String post = HttpClientUtils.sendPost (HIS_URL+"Outpinconapply", map);
return AjaxResult.success ().put ("data", post);
}
@@ -82,7 +105,7 @@
map.put ("his_registration_id", jzh);
map.put ("jzrq", jzrq);
map.put ("jzysbm", jzysbm);
- String post = HttpClientUtils.sendPost (HIS_URL, map);
+ String post = HttpClientUtils.sendPost (HIS_URL+"Outpinunconapply", map);
return AjaxResult.success ().put ("data", post);
}
@@ -116,7 +139,7 @@
map.put ("qchs", dto.getQchs ());
map.put ("sfqj", dto.getSfqj ());
map.put ("ckrq", dto.getCkrq ());
- String post = HttpClientUtils.sendPost (HIS_URL, map);
+ String post = HttpClientUtils.sendPost (HIS_URL+"Outpinimpapply", map);
return AjaxResult.success ().put ("data", post);
}
@@ -131,7 +154,7 @@
map.put ("czybm", czybm);
map.put ("zflxbm", zflxbm);
map.put ("yjje", yjje);
- String post = HttpClientUtils.sendPost (HIS_URL, map);
+ String post = HttpClientUtils.sendPost (HIS_URL+"Outpinmesapply", map);
return AjaxResult.success ().put ("data", post);
}
@@ -149,7 +172,7 @@
map.put ("ywckbm", dao.getYwckbm ());
map.put ("sflstd", dao.getSflstd ());
map.put ("ghrq", dao.getGhrq ());
- String post = HttpClientUtils.sendPost (HIS_URL, map);
+ String post = HttpClientUtils.sendPost (HIS_URL+"Outpinregapply", map);
return AjaxResult.success ().put ("data", post);
}
@@ -165,7 +188,7 @@
map.put ("czyksbm", dao.getCzyksbm ());
map.put ("sfjz", dao.getSfjz ());
map.put ("details", dao.getDetails ());
- String post = HttpClientUtils.sendPost (HIS_URL, map);
+ String post = HttpClientUtils.sendPost (HIS_URL+"Outpintestapply", map);
return AjaxResult.success ().put ("data", post);
}
@@ -178,7 +201,7 @@
map.put ("his_registration_id", hisRegistrationId);
map.put ("czybm", czybm);
map.put ("zflxbm", sqdh);
- String post = HttpClientUtils.sendPost (HIS_URL, map);
+ String post = HttpClientUtils.sendPost (HIS_URL+"Outpindeltestapply", map);
return AjaxResult.success ().put ("data", post);
}
@@ -199,7 +222,7 @@
map.put ("jcbw", dao.getJcbw ());
map.put ("sfjz", dao.getSfjz ());
map.put ("details", dao.getDetails ());
- String post = HttpClientUtils.sendPost (HIS_URL, map);
+ String post = HttpClientUtils.sendPost (HIS_URL+"Outpinexamapply", map);
return AjaxResult.success ().put ("data", post);
}
@@ -212,7 +235,7 @@
map.put ("his_registration_id", hisRegistrationId);
map.put ("czybm", czybm);
map.put ("zflxbm", sqdh);
- String post = HttpClientUtils.sendPost (HIS_URL, map);
+ String post = HttpClientUtils.sendPost (HIS_URL+"Outpindelexamapply", map);
return AjaxResult.success ().put ("data", post);
}
@@ -230,7 +253,7 @@
map.put ("bqsm", dao.getBqsm ());
map.put ("sfjz", dao.getSfjz ());
map.put ("details", dao.getDetails ());
- String post = HttpClientUtils.sendPost (HIS_URL, map);
+ String post = HttpClientUtils.sendPost (HIS_URL+"Outpinmedapply", map);
return AjaxResult.success ().put ("data", post);
}
@@ -243,7 +266,7 @@
map.put ("his_registration_id", hisRegistrationId);
map.put ("czybm", czybm);
map.put ("zflxbm", sqdh);
- String post = HttpClientUtils.sendPost (HIS_URL, map);
+ String post = HttpClientUtils.sendPost (HIS_URL+"Outpindelmedapply", map);
return AjaxResult.success ().put ("data", post);
}
@@ -262,7 +285,7 @@
map.put ("sfjz", dao.getSfjz ());
map.put ("zlbz", dao.getZlbz ());
map.put ("details", dao.getDetails ());
- String post = HttpClientUtils.sendPost (HIS_URL, map);
+ String post = HttpClientUtils.sendPost (HIS_URL+"Outpintreatapply", map);
return AjaxResult.success ().put ("data", post);
}
@@ -274,7 +297,7 @@
map.put ("his_registration_id", hisRegistrationId);
map.put ("czybm", czybm);
map.put ("zflxbm", sqdh);
- String post = HttpClientUtils.sendPost (HIS_URL, map);
+ String post = HttpClientUtils.sendPost (HIS_URL+"Outpintdelreatapply", map);
return AjaxResult.success ().put ("data", post);
}
@@ -294,7 +317,7 @@
map.put ("fyts", dao.getFyts ());
map.put ("mzzd", dao.getMzzd ());
map.put ("details", dao.getDetails ());
- String post = HttpClientUtils.sendPost (HIS_URL, map);
+ String post = HttpClientUtils.sendPost (HIS_URL+"Outpinmedicapply", map);
return AjaxResult.success ().put ("data", post);
}
@@ -306,7 +329,7 @@
map.put ("his_registration_id", hisRegistrationId);
map.put ("czybm", czybm);
map.put ("zflxbm", sqdh);
- String post = HttpClientUtils.sendPost (HIS_URL, map);
+ String post = HttpClientUtils.sendPost (HIS_URL+"Outpindelmedicapply", map);
return AjaxResult.success ().put ("data", post);
}
@@ -321,7 +344,7 @@
map.put ("ksbm", ksbm);
map.put ("jsrq", jsrq);
map.put ("ksrq", ksrq);
- String post = HttpClientUtils.sendPost (HIS_URL, map);
+ String post = HttpClientUtils.sendPost (HIS_URL+"Getexamapplyinfo", map);
return AjaxResult.success ().put ("data", post);
}
@@ -346,7 +369,7 @@
map.put ("page", page);
map.put ("status", status);
map.put ("cardtype", cardtype);
- String post = HttpClientUtils.sendPost (HIS_URL, map);
+ String post = HttpClientUtils.sendPost (HIS_URL+"Getexamreportinfo", map);
return AjaxResult.success ().put ("data", post);
}
@@ -425,7 +448,7 @@
map.put ("wjzclrq", dto.getWjzclrq ());
map.put ("sfkf", dto.getSfkf ());
map.put ("yzid", dto.getYzid ());
- String post = HttpClientUtils.sendPost (HIS_URL, map);
+ String post = HttpClientUtils.sendPost (HIS_URL+"Examreportrecordinfo", map);
return AjaxResult.success ().put ("data", post);
}
@@ -441,7 +464,7 @@
map.put ("ksrq", ksrq);
map.put ("pagecount", pagecount);
map.put ("page", page);
- String post = HttpClientUtils.sendPost (HIS_URL, map);
+ String post = HttpClientUtils.sendPost (HIS_URL+"Getexamurgentinfo", map);
return AjaxResult.success ().put ("data", post);
}
@@ -458,7 +481,7 @@
map.put ("ksrq", ksrq);
map.put ("pagecount", pagecount);
map.put ("page", page);
- String post = HttpClientUtils.sendPost (HIS_URL, map);
+ String post = HttpClientUtils.sendPost (HIS_URL+"Getexamimageinfo", map);
return AjaxResult.success ().put ("data", post);
}
@@ -477,7 +500,7 @@
map.put ("cardtype", cardtype);
map.put ("mzorzy", mzorzy);
map.put ("ksbm", ksbm);
- String post = HttpClientUtils.sendPost (HIS_URL, map);
+ String post = HttpClientUtils.sendPost (HIS_URL+"Getlabapplyinfo", map);
return AjaxResult.success ().put ("data", post);
}
@@ -498,7 +521,7 @@
map.put ("pationid", pationid);
map.put ("pagecount", pagecount);
map.put ("page", page);
- String post = HttpClientUtils.sendPost (HIS_URL, map);
+ String post = HttpClientUtils.sendPost (HIS_URL+"Getlabreportinfo", map);
return AjaxResult.success ().put ("data", post);
}
@@ -507,7 +530,7 @@
public AjaxResult Getlabgermrepinfo (String jybgid) {
Map<String, Object> map = new HashMap<> ();
map.put ("jybgid", jybgid);
- String post = HttpClientUtils.sendPost (HIS_URL, map);
+ String post = HttpClientUtils.sendPost (HIS_URL+"Getlabgermrepinfo", map);
return AjaxResult.success ().put ("data", post);
}
@@ -515,7 +538,7 @@
public AjaxResult Getlabgermdetailinfo (String jybgid) {
Map<String, Object> map = new HashMap<> ();
map.put ("jybgid", jybgid);
- String post = HttpClientUtils.sendPost (HIS_URL, map);
+ String post = HttpClientUtils.sendPost (HIS_URL+"Getlabgermdetailinfo", map);
return AjaxResult.success ().put ("data", post);
}
@@ -528,7 +551,7 @@
map.put ("jybgid", jybgid);
map.put ("jsrq", jsrq);
map.put ("ksrq", ksrq);
- String post = HttpClientUtils.sendPost (HIS_URL, map);
+ String post = HttpClientUtils.sendPost (HIS_URL+"Getlaburgentinfo", map);
return AjaxResult.success ().put ("data", post);
}
@@ -543,7 +566,7 @@
map.put ("jsrydm", jsrydm);
map.put ("jsrq", jsrq);
map.put ("jsyy", jsyy);
- String post = HttpClientUtils.sendPost (HIS_URL, map);
+ String post = HttpClientUtils.sendPost (HIS_URL+"Labreportapply", map);
return AjaxResult.success ().put ("data", post);
}
@@ -564,7 +587,7 @@
map.put ("pationid", pationid);
map.put ("pagecount", pagecount);
map.put ("page", page);
- String post = HttpClientUtils.sendPost (HIS_URL, map);
+ String post = HttpClientUtils.sendPost (HIS_URL+"Getlabreginfoinfo", map);
return AjaxResult.success ().put ("data", post);
}
@@ -591,7 +614,7 @@
map.put ("mxfyxmbm", dao.getMxfyxmbm ());
map.put ("sfzhfy", dao.getSfzhfy ());
map.put ("sl", dao.getSl ());
- String post = HttpClientUtils.sendPost (HIS_URL, map);
+ String post = HttpClientUtils.sendPost (HIS_URL+"Testcostapply", map);
return AjaxResult.success ().put ("data", post);
}
@@ -618,7 +641,7 @@
map.put ("je", dao.getJe ());
map.put ("sjje", dao.getSjje ());
map.put ("details_mx", dao.getDetailsMx ());
- String post = HttpClientUtils.sendPost (HIS_URL, map);
+ String post = HttpClientUtils.sendPost (HIS_URL+"Testregapply", map);
return AjaxResult.success ().put ("data", post);
}
@@ -637,7 +660,7 @@
map.put ("ksrq", ksrq);
map.put ("pagecount", pagecount);
map.put ("page", page);
- String post = HttpClientUtils.sendPost (HIS_URL, map);
+ String post = HttpClientUtils.sendPost (HIS_URL+"Getoutpatientcostinfo", map);
return AjaxResult.success ().put ("data", post);
}
@@ -654,7 +677,7 @@
map.put ("ksrq", ksrq);
map.put ("pagecount", pagecount);
map.put ("page", page);
- String post = HttpClientUtils.sendPost (HIS_URL, map);
+ String post = HttpClientUtils.sendPost (HIS_URL+"Getoutaccountrecord", map);
return AjaxResult.success ().put ("data", post);
}
@@ -667,7 +690,7 @@
map.put ("mzzybz", mzzybz);
map.put ("jsrq", jsrq);
map.put ("ksrq", ksrq);
- String post = HttpClientUtils.sendPost (HIS_URL, map);
+ String post = HttpClientUtils.sendPost (HIS_URL+"Getpatientalterregrecord", map);
return AjaxResult.success ().put ("data", post);
}
}
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 c4a9dd7..273196a 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
@@ -59,6 +59,7 @@
import com.ltkj.system.service.ISysConfigService;
import com.ltkj.system.service.ISysDeptService;
import com.ltkj.system.service.ISysUserService;
+import com.ltkj.web.controller.his.HisApiMethod;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -169,6 +170,9 @@
private TjvLtkjvtjpatService tjvLtkjvtjpatService;
@Autowired
private ThreadPoolConfig threadPoolConfig;
+
+ @Autowired
+ private HisApiMethod hisApiMethod;
/**
@@ -906,6 +910,7 @@
tjOrder.setStatus(TjConstants.TJ_BEGIN);
tjOrder.setCardId(tjCustomer.getCardId());
if (tjOrderService.save(tjOrder)) {
+
//淇濆瓨鏀惰揣鍦板潃
if ("2".equals(tjOrder.getGetType())) {
final TjReportGetAddress address = tjOrder.getAddAddress();
@@ -1015,6 +1020,8 @@
// }
tjCustomer.setCardId("0");
tjCustomerService.updateById(tjCustomer);
+ //璋冪敤his鎺ュ彛
+ hisApiMethod.HisApiMethods(tjCustomer,tjOrder.getOrderId());
return AjaxResult.success(tjNumber);
}
return AjaxResult.error();
diff --git a/ltkj-admin/src/main/resources/application.yml b/ltkj-admin/src/main/resources/application.yml
index 799fa3f..7fc75bc 100644
--- a/ltkj-admin/src/main/resources/application.yml
+++ b/ltkj-admin/src/main/resources/application.yml
@@ -220,10 +220,10 @@
jimu:
# path: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin
# path: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin
-# path: http://192.168.0.5:5000/ltkj-admin
+ path: http://192.168.0.5:5000/ltkj-admin
# path: http://10.168.0.9:5011
# path: http://192.168.0.105:5011
- path: http://192.168.1.113:5011
+# path: http://192.168.1.113:5011
jeecg :
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/hisDto/OutpinexamapplyDto.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/hisDto/OutpinexamapplyDto.java
index eb672b8..d49f971 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/hisDto/OutpinexamapplyDto.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/hisDto/OutpinexamapplyDto.java
@@ -1,8 +1,10 @@
package com.ltkj.hosp.hisDto;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
+import java.util.Date;
import java.util.List;
@Data
@@ -11,7 +13,8 @@
private String sfzh;
private String sqysbm;
private String mzksbm;
- private String sjrq;
+ @JsonFormat (pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date sjrq;
private String czybm;
private String czyksbm;
private String lczz;
--
Gitblit v1.8.0