From 73a816fd2b1e29c25d615c85ce34b12b55c16ccf Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 20 一月 2025 13:41:45 +0800
Subject: [PATCH] zjh20250120
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java | 175 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 137 insertions(+), 38 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..4bf715a 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;
@@ -123,13 +121,23 @@
// }
// }
List<String> strings = tjOrderService.selectTjOrderByCardId1();
- if (null != strings && strings.size() > 0) {
+ if (null != strings && !strings.isEmpty()) {
List<Map<String, Object>> collect = maps.stream()
.filter(item -> !strings.contains(item.get("pacCode").toString())).collect(Collectors.toList());
return AjaxResult.success(collect);
}
return AjaxResult.success(maps);
// return AjaxResult.success(maps);
+ }
+
+
+ @GetMapping("/vcustomerlist")
+ @ApiOperation(value = "绛惧埌鐧昏椤甸潰濮撳悕鏍忓脊妗嗘帴鍙�")
+ public AjaxResult vcustomerlist(@RequestParam(required = false) String name,
+ @RequestParam(required = false) String sjh,
+ @RequestParam(required = false) String sfzh) {
+ List<Map<String, Object>> maps = tjCustomerService.vcustomerlist(name, sjh, sfzh);
+ return AjaxResult.success(maps);
}
@@ -210,7 +218,7 @@
}
String key = sysConfigService.selectConfigByKey("sfkqdyhis");
-
+ String s = sysConfigService.selectConfigByKey("is_request_common_his_api");
LambdaQueryWrapper<TjReservation> wq = new LambdaQueryWrapper<>();
wq.eq(TjReservation::getIdCard, cusIdcard);
wq.eq(TjReservation::getIsExpire, 2);
@@ -227,9 +235,9 @@
qw.eq(TjCustomer::getCusIdcard, cusIdcard);
TjCustomer tjCustomer1 = tjCustomerService.getOne(qw);
if (tjCustomer1 != null) {
- if (null != tjReservation.getCompanyId()) tjCustomer1.setDictCompId(Long.valueOf(tjReservation.getCompanyId()));
- if (null != tjReservation.getCompany()) tjCustomer1.setCompName(tjReservation.getCompany());
- tjCustomerService.updateById(tjCustomer1);
+// if (null != tjReservation.getCompanyId()) tjCustomer1.setDictCompId(Long.valueOf(tjReservation.getCompanyId()));
+// if (null != tjReservation.getCompany()) tjCustomer1.setCompName(tjReservation.getCompany());
+// tjCustomerService.updateById(tjCustomer1);
tjCustomer1.setTjType(tjReservation.getTjType());
tjCustomer1.setCusName(tjReservation.getName());
tjCustomer1.setCusSex(Long.valueOf(tjReservation.getSex()));
@@ -252,8 +260,8 @@
tjCustomer1.setDiscount(tjReservation.getDiscount());
tjCustomer1.setGroupingId(tjReservation.getGroupingId());
- if(null !=tjReservation.getCompanyId())tjCustomer1.setDictCompId(Long.valueOf(tjReservation.getCompanyId()));
- if(null !=tjReservation.getCompany())tjCustomer1.setCompName(tjReservation.getCompany());
+// if(null !=tjReservation.getCompanyId())tjCustomer1.setDictCompId(Long.valueOf(tjReservation.getCompanyId()));
+// if(null !=tjReservation.getCompany())tjCustomer1.setCompName(tjReservation.getCompany());
// tjCustomerService.updateById(tjCustomer1);
@@ -283,10 +291,10 @@
tjCustomer.setCusPassword(substring);
tjCustomer.setTjType(tjReservation.getTjType());
tjCustomer.setPym(PinyinUtil.getFirstLetter(tjReservation.getName(),""));
- if(null !=tjReservation.getCompanyId())tjCustomer.setDictCompId(Long.valueOf(tjReservation.getCompanyId()));
- if(null !=tjReservation.getCompany())tjCustomer.setCompName(tjReservation.getCompany());
- if (null != key && key.equals("Y"))
- {
+// if(null !=tjReservation.getCompanyId())tjCustomer.setDictCompId(Long.valueOf(tjReservation.getCompanyId()));
+// if(null !=tjReservation.getCompany())tjCustomer.setCompName(tjReservation.getCompany());
+
+ if (null != key && key.equals("Y")) {
AjaxResult result = controller.Outpincreateapply(tjCustomer);
String result1 = getAjaxResult(result);
JSONObject object = getJSONObject(result1);
@@ -308,6 +316,11 @@
hisApiGetMethodService.save(object4, "Outpincreateapply", hisApiConfig, JSONUtil.toJsonStr(BeanUtil.beanToMap(tjCustomer)));
}
}
+ }
+ } else if(null != s && s.equalsIgnoreCase("Y")) {
+ TjCustomer requestCommonHisApi = isRequestCommonHisApi(tjCustomer);
+ if (null !=requestCommonHisApi){
+ tjCustomerService.save(requestCommonHisApi);
}
}else {
tjCustomerService.save(tjCustomer);
@@ -374,6 +387,27 @@
}
+ @GetMapping("/getcusList")
+ @ApiOperation(value = "妗ｆ绠＄悊鎺ュ彛")
+ public TableDataInfo getcusList(TjCustomer tjCustomer) {
+ startPage();
+ List<TjCustomer> list = tjCustomerService.getcusList(tjCustomer);
+ if (null != list && !list.isEmpty()) {
+ for (TjCustomer customer : list) {
+ customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
+ customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
+ TjCustomerBlack tjCustomerBlack = blackService.isTjCustomerBlack(String.valueOf(customer.getCusId()));
+ if (null != tjCustomerBlack) {
+ customer.setIsBlack("Y");
+ } else {
+ customer.setIsBlack("N");
+ }
+ }
+ }
+ return getDataTable(list);
+ }
+
+
/**
* 鏌ヨ瀹㈡埛淇℃伅鍒楄〃
*/
@@ -383,9 +417,8 @@
public TableDataInfo list(TjCustomer tjCustomer) {
startPage();
List<TjCustomer> list = tjCustomerService.selectTjCustomerList(tjCustomer);
- if (null != list && list.size() > 0) {
+ if (null != list && !list.isEmpty()) {
for (TjCustomer customer : list) {
-// customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
TjCustomerBlack tjCustomerBlack = blackService.isTjCustomerBlack(String.valueOf(customer.getCusId()));
@@ -428,6 +461,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,11 +525,59 @@
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")){
+ TjCustomer requestCommonHisApi = isRequestCommonHisApi(tjCustomer);
+ if (null !=requestCommonHisApi){
+ if (tjCustomerService.save(requestCommonHisApi)) {
+ return AjaxResult.success(requestCommonHisApi);
+ }
+ }
+ }else {
+ if (tjCustomerService.save(tjCustomer)) {
+ return AjaxResult.success(tjCustomer);
+ }
}
}
return AjaxResult.error();
+ }
+
+ private TjCustomer isRequestCommonHisApi(TjCustomer tjCustomer) {
+ 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","");
+ 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"));
+ return 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","");
+ 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","");
+ 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"));
+ return tjCustomer;
+ }
+ }
+ return null;
}
private AjaxResult suijieHisXinXi(TjCustomer tjCustomer, String date) {
@@ -506,7 +588,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 +614,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 +664,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","");
+ 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","");
+ 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 +711,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