From c554eccf65b7c75b47bbd3fc9e6deb4e64262638 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期四, 26 十二月 2024 15:18:41 +0800
Subject: [PATCH] 20241226
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java | 108 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 83 insertions(+), 25 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
index 181d9c0..0922451 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
@@ -31,6 +31,7 @@
import com.ltkj.web.controller.his.HisApiGetMethodService;
import com.ltkj.web.controller.his.HisApiMethod;
import com.ltkj.web.controller.his.HisApiMethodService;
+import com.ltkj.web.wxUtils.HttpClientUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -44,10 +45,7 @@
import com.ltkj.common.utils.poi.ExcelUtil;
import com.ltkj.common.core.page.TableDataInfo;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
@@ -428,6 +426,7 @@
@ApiOperation(value = "鏂板瀹㈡埛")
@Transactional
@RepeatSubmit
+ @Log(title = "鏂板瀹㈡埛淇℃伅", businessType = BusinessType.INSERT)
public AjaxResult add(@RequestBody @ApiParam(value = "瀹㈡埛瀵硅薄淇℃伅") TjCustomer tjCustomer) {
if (null == tjCustomer.getCusIdcard() || null == tjCustomer.getCusPhone()) {
return AjaxResult.error("璇疯緭鍏ヨ韩浠借瘉鍙锋垨鎵嬫満鍙�");
@@ -491,8 +490,50 @@
AjaxResult tjCustomer1 = suijieHisXinXi(tjCustomer, date);
if (tjCustomer1 != null) return tjCustomer1;
} else {
- if (tjCustomerService.save(tjCustomer)) {
- return AjaxResult.success(tjCustomer);
+ String s = sysConfigService.selectConfigByKey("is_request_common_his_api");
+ if (null != s && s.equals("Y")){
+ String apiUrl = sysConfigService.selectConfigByKey("common_api_url");
+ String hospbm = sysConfigService.selectConfigByKey("common_api_service_hospbm");
+ HashMap<String, Object> isjd = new HashMap<>();
+ isjd.put("cusIdCard",tjCustomer.getCusIdcard());
+// isjd.put("compId",tjCustomer.getCompId());
+ String isCreat = HttpClientUtils.sendPost(apiUrl+"/api/his/"+hospbm+"/isCreat", isjd);
+ JSONObject isCreatjsonObject = JSONUtil.parseObj(isCreat);
+ if (isCreatjsonObject.getStr("code").equals("200")){
+ JSONObject data = isCreatjsonObject.getJSONObject("data");
+ tjCustomer.setPationId(data.getStr("pationId"));
+ tjCustomer.setCardId(data.getStr("cardId"));
+ tjCustomer.setHisJzkh(data.getStr("cardId"));
+ if (tjCustomerService.save(tjCustomer)) {
+ return AjaxResult.success(tjCustomer);
+ }
+ }else {
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("cardId","");
+ map.put("cusName",tjCustomer.getCusName());
+ map.put("cusSex",tjCustomer.getCusSex());
+ map.put("cusIdCard",tjCustomer.getCusIdcard());
+ map.put("compId",tjCustomer.getCompId());
+ map.put("cusBrithday",tjCustomer.getCusBrithday() != null ? DateUtil.format(tjCustomer.getCusBrithday(), "yyyy-MM-dd") : "");
+ map.put("cusAddr",tjCustomer.getCusAddr());
+ map.put("cusPhone",tjCustomer.getCusPhone());
+ map.put("compName",tjCustomer.getCompName());
+ String post = HttpClientUtils.sendPost(apiUrl+"/api/his/"+hospbm+"/creat", map);
+ JSONObject jsonObject = JSONUtil.parseObj(post);
+ if (jsonObject.getStr("code").equals("200")){
+ JSONObject data = jsonObject.getJSONObject("data");
+ tjCustomer.setPationId(data.getStr("pationId"));
+ tjCustomer.setCardId(data.getStr("cardId"));
+ tjCustomer.setHisJzkh(data.getStr("cardId"));
+ if (tjCustomerService.save(tjCustomer)) {
+ return AjaxResult.success(tjCustomer);
+ }
+ }else return AjaxResult.error();
+ }
+ }else {
+ if (tjCustomerService.save(tjCustomer)) {
+ return AjaxResult.success(tjCustomer);
+ }
}
}
return AjaxResult.error();
@@ -506,7 +547,7 @@
if (code.equals("0")) {
JSONArray resultDatass = object.getJSONArray("ResultData");
Map<String, Object> resultData = (Map<String, Object>) resultDatass.get(0);
- if (null != resultData && resultData.size() > 0) {
+ if (null != resultData && !resultData.isEmpty()) {
String pationid = resultData.get("PationId").toString();
if (null != pationid) {
tjCustomer.setPationId(pationid);
@@ -532,9 +573,11 @@
* 淇敼瀹㈡埛淇℃伅
*/
//@PreAuthorize("@ss.hasPermi('hosp:customer:edit')")
- @Log(title = "瀹㈡埛淇℃伅", businessType = BusinessType.UPDATE)
+ @Log(title = "淇敼瀹㈡埛淇℃伅", businessType = BusinessType.UPDATE)
@PutMapping
@ApiOperation(value = "淇敼瀹㈡埛淇℃伅")
+ @Transactional
+ @RepeatSubmit
public AjaxResult edit(@RequestBody @ApiParam(value = "瀹㈡埛瀵硅薄") TjCustomer tjCustomer) {
TjCustomer customer = tjCustomerService.getById(tjCustomer.getCusId());
@@ -580,26 +623,41 @@
JSONObject object = getJSONObject(result1);
String code = object.getStr("ResultCode");
if (code.equals("0")) {
- /* JSONArray resultDatass = object.getJSONArray("ResultData");
- Map<String, Object> resultData = (Map<String, Object>) resultDatass.get(0);
- if (null != resultData && resultData.size() > 0) {
- String pationid = resultData.get("PationId").toString();
- if (null != pationid) {
- tjCustomer.setPationId(pationid);
- tjCustomerService.updateById(tjCustomer);
- }
- }*/
- //淇濆瓨淇敼鍏ュ弬鍑哄弬
-// object.putOpt("cardId",customer.getPationId());
-// LambdaQueryWrapper<HisApiConfig> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-// lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, "Outpincreateapply");
-// HisApiConfig hisApiConfig = hisApiConfigService.getOne(lambdaQueryWrapper);
-// hisApiGetMethodService.save(object, "Outpincreateapply", hisApiConfig, JSONUtil.toJsonStr(BeanUtil.beanToMap(tjCustomer)));
return AjaxResult.success();
}
return AjaxResult.error(object.getStr("ResultContent"));
+ }else {
+ String s = sysConfigService.selectConfigByKey("is_request_common_his_api");
+ if (null != s && s.equals("Y")){
+ String apiUrl = sysConfigService.selectConfigByKey("common_api_url");
+ String hospbm = sysConfigService.selectConfigByKey("common_api_service_hospbm");
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("pationId",tjCustomer.getPationId());
+ map.put("cardId",tjCustomer.getCardId());
+ map.put("cusName",tjCustomer.getCusName());
+ map.put("cusSex",tjCustomer.getCusSex());
+ map.put("cusIdCard",tjCustomer.getCusIdcard());
+ map.put("compId",tjCustomer.getCompId());
+ map.put("cusBrithday",tjCustomer.getCusBrithday() != null ? DateUtil.format(tjCustomer.getCusBrithday(), "yyyy-MM-dd") : "");
+ map.put("cusAddr",tjCustomer.getCusAddr());
+ map.put("cusPhone",tjCustomer.getCusPhone());
+ map.put("compName",tjCustomer.getCompName());
+ String isCreat = HttpClientUtils.sendPost(apiUrl+"/api/his/"+hospbm+"/update", map);
+ JSONObject isCreatjsonObject = JSONUtil.parseObj(isCreat);
+ if (isCreatjsonObject.getStr("code").equals("200")){
+// JSONObject data = isCreatjsonObject.getJSONObject("data");
+// tjCustomer.setPationId(data.getStr("pationId"));
+// tjCustomer.setCardId(data.getStr("cardId"));
+// tjCustomer.setHisJzkh(data.getStr("cardId"));
+// if (tjCustomerService.updateById(tjCustomer)) {
+ return AjaxResult.success(tjCustomer);
+// }
+ }else {
+ return AjaxResult.error();
+ }
+ }
+ return AjaxResult.success();
}
- return AjaxResult.success();
}
return AjaxResult.error();
}
@@ -612,6 +670,6 @@
@DeleteMapping("/{cusIds}")
@ApiOperation(value = "鍒犻櫎瀹㈡埛")
public AjaxResult remove(@PathVariable @ApiParam(value = "鎵�鍒犻櫎瀹㈡埛鐨刬d") Long[] cusIds) {
- return toAjax(tjCustomerService.deleteTjCustomerByCusIds(cusIds));
+ return toAjax(tjCustomerService.removeByIds(Arrays.asList(cusIds)));
}
}
--
Gitblit v1.8.0