From edd22f77d054237b32628a91f217fd18288b13d6 Mon Sep 17 00:00:00 2001
From: 赵文轩 <1652863494@qq.com>
Date: 星期三, 08 一月 2025 10:11:45 +0800
Subject: [PATCH] 泾川his补录调整
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java | 60 +++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 45 insertions(+), 15 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 0922451..8c09de2 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
@@ -121,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);
}
@@ -225,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()));
@@ -250,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);
@@ -281,8 +291,8 @@
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 !=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);
@@ -372,6 +382,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);
+ }
+
+
/**
* 鏌ヨ瀹㈡埛淇℃伅鍒楄〃
*/
@@ -381,9 +412,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()));
@@ -496,7 +526,7 @@
String hospbm = sysConfigService.selectConfigByKey("common_api_service_hospbm");
HashMap<String, Object> isjd = new HashMap<>();
isjd.put("cusIdCard",tjCustomer.getCusIdcard());
-// isjd.put("compId",tjCustomer.getCompId());
+ isjd.put("compId","");
String isCreat = HttpClientUtils.sendPost(apiUrl+"/api/his/"+hospbm+"/isCreat", isjd);
JSONObject isCreatjsonObject = JSONUtil.parseObj(isCreat);
if (isCreatjsonObject.getStr("code").equals("200")){
@@ -513,11 +543,11 @@
map.put("cusName",tjCustomer.getCusName());
map.put("cusSex",tjCustomer.getCusSex());
map.put("cusIdCard",tjCustomer.getCusIdcard());
- map.put("compId",tjCustomer.getCompId());
+ 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",tjCustomer.getCompName());
+ map.put("compName","");
String post = HttpClientUtils.sendPost(apiUrl+"/api/his/"+hospbm+"/creat", map);
JSONObject jsonObject = JSONUtil.parseObj(post);
if (jsonObject.getStr("code").equals("200")){
@@ -637,11 +667,11 @@
map.put("cusName",tjCustomer.getCusName());
map.put("cusSex",tjCustomer.getCusSex());
map.put("cusIdCard",tjCustomer.getCusIdcard());
- map.put("compId",tjCustomer.getCompId());
+ 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",tjCustomer.getCompName());
+ map.put("compName","");
String isCreat = HttpClientUtils.sendPost(apiUrl+"/api/his/"+hospbm+"/update", map);
JSONObject isCreatjsonObject = JSONUtil.parseObj(isCreat);
if (isCreatjsonObject.getStr("code").equals("200")){
--
Gitblit v1.8.0