From a0dde8aa21d8bc2b55ccbb2278fc730f75f7ef8b Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 18 七月 2025 08:55:13 +0800
Subject: [PATCH] zjh20250718
---
ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java | 199 +++++++++++++++++++++++++++----------------------
1 files changed, 111 insertions(+), 88 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java
index 76e70ae..6018389 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java
@@ -8,10 +8,12 @@
import com.itextpdf.text.Element;
import com.itextpdf.text.Paragraph;
import com.ltkj.common.core.domain.AjaxResult;
+import com.ltkj.framework.config.MatchUtils;
import com.ltkj.hosp.domain.TjCustomer;
import com.ltkj.hosp.domain.TjOrder;
import com.ltkj.hosp.domain.TjOrderYcxm;
import com.ltkj.hosp.mapper.TjCustomerMapper;
+import com.ltkj.hosp.service.ITjCustomerService;
import com.ltkj.hosp.service.ITjOrderDetailService;
import com.ltkj.hosp.service.ITjOrderService;
import com.ltkj.hosp.service.TjOrderYcxmService;
@@ -25,6 +27,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.IOException;
@@ -50,6 +53,8 @@
private TjCheckController tjCheckController;
@Autowired
private TjCustomerMapper tjCustomerMapper;
+ @Resource
+ private ITjCustomerService customerService;
@Autowired
private ITjOrderService tjOrderService;
@Autowired
@@ -87,7 +92,7 @@
wrapper.eq(TjOrder::getTjNumber,tjNum);
List<TjOrder> list = tjOrderService.list(wrapper);
if (list.isEmpty()){
- return AjaxResult.error();
+ return AjaxResult.error("鎶ュ憡鏈牳鏀�,璇锋牳鏀跺悗鏌ョ湅");
}
TjOrder tjOrder = tjOrderService.getOrderByTjNum(tjNum);
TjCustomer tjCustomer = tjCustomerMapper.selectById( tjOrder.getUserId());
@@ -104,7 +109,7 @@
public AjaxResult reportData(@RequestBody String json){
String tjNum = JSONUtil.parseObj(json).getStr("tjNum");
LambdaQueryWrapper<TjOrder> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(TjOrder::getHeshouStatus,1);
+// wrapper.eq(TjOrder::getHeshouStatus,1);
wrapper.eq(TjOrder::getTjNumber,tjNum);
List<TjOrder> list = tjOrderService.list(wrapper);
if (list.isEmpty()){
@@ -115,25 +120,96 @@
LambdaQueryWrapper<TjOrderYcxm> wq = new LambdaQueryWrapper<>();
wq.eq(TjOrderYcxm::getTjh, tjNum);
List<TjOrderYcxm> ycxms = tjOrderYcxmService.list(wq);
- Map<String, List<TjOrderYcxm>> stringListMap = ycxms.stream()
- .collect(Collectors.groupingBy(TjOrderYcxm::getParentName));
- JSONArray jczs = JSONUtil.createArray();
- JSONArray ysjy = JSONUtil.createArray();
+ Map<String, List<TjOrderYcxm>> stringListMap = ycxms.stream().collect(Collectors.groupingBy(TjOrderYcxm::getParentName));
int xmXh = 1;
+ JSONArray jczs = JSONUtil.createArray();
for (Map.Entry<String, List<TjOrderYcxm>> entry : stringListMap.entrySet()) {
List<TjOrderYcxm> details = entry.getValue();
String xmmc = entry.getKey();
- details.sort(Comparator.comparing(TjOrderYcxm::getJcxm));
+ boolean isXmWrite = false;
+ int index = 1;
+ JSONObject object = JSONUtil.createObj();
+ for (TjOrderYcxm detail : details) {
+ if (!isXmWrite) {
+ object.putOpt("xh",xmXh);
+ object.putOpt("xmmc",xmmc);
+ xmXh++;
+ }
+ String result = detail.getJcjg();
+ if (StrUtil.isNotBlank(result)) {
+ result = result.replaceAll("鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�", "");
+ StringBuilder builder = new StringBuilder();
+ if (StrUtil.isBlank(result.replaceAll("\n", "").trim())) continue;
+ builder.append(" (").append(index).append(")").append(detail.getJcxm()).append(": ").append(result).append("\n");
+ index++;
+ result = builder.toString();
+ }
+ object.putOpt("result",result);
+ }
+ jczs.add(object);
+ }
+ entries.putOpt("jczs",jczs);
- JSONObject jczObject = processDetails(details, xmmc, xmXh, true);
- jczs.add(jczObject);
+ xmXh = 1;
+ JSONArray ysjy = JSONUtil.createArray();
+ for (Map.Entry<String, List<TjOrderYcxm>> entry : stringListMap.entrySet()) {
+ List<TjOrderYcxm> details = entry.getValue();
+ if(null !=details && !details.isEmpty()){
+ details= details.stream()
+ .sorted(Comparator.comparing(TjOrderYcxm::getJcxm))
+ .collect(Collectors.toList());
+ boolean isXmWrite = false;
+ int index1 = 1;
+ for (TjOrderYcxm detail : details) {
+ JSONObject obj = JSONUtil.createObj();
+ String xmmc = entry.getKey().toString();
+ if (!isXmWrite) {
+ isXmWrite = true;
+ obj.putOpt("xh",xmXh);
+ obj.putOpt("xmmc",xmmc);
+ xmXh++;
+ }
+ String result = detail.getJcjg();
+ if (StrUtil.isNotBlank(result)) {
+ StringBuilder builder = new StringBuilder();
+ if (StrUtil.isBlank(result.replaceAll("\n", "").trim())) continue;
+ builder.append(" (").append(index1).append(")").append(detail.getJcxm()).append(": ").append(result).append("\n");
+ index1++;
+ result = builder.toString();
+ }
+ if (StrUtil.isNotBlank(result)) {
+ obj.putOpt("result",result);
+ } else {
+ obj.putOpt("result","寤鸿瀹氭湡澶嶆煡");
+ }
+ String str = " ";
+ List<Map<String, Object>> maps = new ArrayList<>();
- JSONObject ysjyObject = processDetails(details, xmmc, xmXh, false);
- ysjy.add(ysjyObject);
+ String jynr = detail.getJynr();
+ JSONArray array = JSONUtil.parseArray(jynr);
+ for (Object object : array) {
+ Map<String,Object> objectMap=new HashMap<>();
+ JSONObject jsonObject = (JSONObject) object;
+ String bt = jsonObject.getStr("bt");
+ String nr = jsonObject.getStr("nr");
+ objectMap.put("bt",bt);
+ objectMap.put("nr",nr);
+ if(null !=bt || null !=nr) maps.add(objectMap);
+ }
+ ArrayList<String> strings = new ArrayList<>();
+ List<Map<String, Object>> collect1 = maps.stream().distinct().collect(Collectors.toList());
+ for (Map<String, Object> objectMap : collect1) {
+ String content = str + objectMap.get("bt").toString() + objectMap.get("nr").toString();
+ if (StrUtil.isBlank(content)) content = " ";
+ strings.add(content);
+ }
+ obj.putOpt("contents",strings);
+ ysjy.add(obj);
+ }
+ }
}
- entries.putOpt("jczs", jczs);
- entries.putOpt("ysjy", ysjy);
+ entries.putOpt("ysjy",ysjy);
removeNullFields(entries);
return JSONUtil.toBean(entries, AjaxResult.class);
@@ -229,84 +305,31 @@
/**
* 灏忕▼搴忕偣鍑讳綋妫�鎶ュ憡鏌ヨ璇︽儏,鏄剧ず韬珮浣撻噸浣撻噸鎸囨暟鏀剁缉鍘嬭垝寮犲帇
*/
- @GetMapping("/getShenGaoTiZhong")
- @ApiOperation(value = "灏忕▼搴�-浣撴鎶ュ憡鏌ヨ璇︽儏")
- public AjaxResult getShenGaoTiZhong(@RequestParam @ApiParam(value = "浣撴鍙�") String tjNumber) {
-// Map<String, Object> objectMap = new HashMap<>();
- LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
- wq1.eq(TjOrder::getTjNumber, tjNumber);
- wq1.eq(TjOrder::getCheckStatus, 1);
- TjOrder one = tjOrderService.getOne(wq1);
- if (one == null) {
- return AjaxResult.success("浣撴鏆傛湭瀹屾垚锛侊紒");
+ @GetMapping("/updatePhone")
+ @ApiOperation(value = "灏忕▼搴�-淇敼鎵嬫満鍙锋帴鍙�")
+ public AjaxResult updatePhone(@RequestParam @ApiParam(value = "韬唤璇佸彿") String sfzh,
+ @RequestParam @ApiParam(value = "濮撳悕") String name,
+ @RequestParam @ApiParam(value = "鎵嬫満鍙�") String phone) {
+ if(StrUtil.isBlank(sfzh) || StrUtil.isBlank(name) || StrUtil.isBlank(phone)){
+ return AjaxResult.error("璇疯緭鍏ユ纭殑淇℃伅!");
}
-
- List<ShenGaoTiZhongVo> maps = detailService.getShenGaoTiZhongList(one.getTjNumber());
-
- log.info("ltkj {}鐨勪綋妫�鎶ュ憡鏌ヨ璇︽儏"+maps,tjNumber);
- return AjaxResult.success(maps);
-
- }
-
- private JSONObject processDetails(List<TjOrderYcxm> details, String xmmc, int xmXh, boolean isJcz) {
- JSONObject object = JSONUtil.createObj();
- boolean isXmWrite = false;
- int index = 1;
- for (TjOrderYcxm detail : details) {
- if (!isXmWrite) {
- object.putOpt("xh", xmXh++);
- object.putOpt("xmmc", xmmc);
- isXmWrite = true;
- }
- String result = detail.getJcjg();
- if (StrUtil.isNotBlank(result)) {
- result = result.replaceAll("鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�", "")
- .replaceAll("\n", "").trim();
- if (StrUtil.isNotBlank(result)) {
- StringBuilder builder = new StringBuilder();
- builder.append(" (").append(index).append(")").append(detail.getJcxm())
- .append(": ").append(result).append("\n");
- index++;
- result = builder.toString();
- }
- }
-
- if (StrUtil.isNotBlank(result)) {
- object.putOpt("result", result);
- } else {
- object.putOpt("result", isJcz ? result : "寤鸿瀹氭湡澶嶆煡");
- }
- if (!isJcz) {
- JSONArray contents = processJynr(detail.getJynr());
- object.putOpt("contents", contents);
- }
+ if(!MatchUtils.isIdCard(sfzh)){
+ return AjaxResult.error("韬唤璇佸彿鏍煎紡閿欒 璇锋牳瀵瑰悗閲嶆柊杈撳叆!");
}
- return object;
- }
-
- private JSONArray processJynr(String jynr) {
- JSONArray contents = JSONUtil.createArray();
- List<Map<String, Object>> maps = JSONUtil.parseArray(jynr).stream()
- .map(o -> {
- JSONObject jsonObject = (JSONObject) o;
- Map<String, Object> map = new HashMap<>();
- String bt = jsonObject.getStr("bt");
- String nr = jsonObject.getStr("nr");
- if (StrUtil.isNotBlank(bt) || StrUtil.isNotBlank(nr)) {
- map.put("bt", bt);
- map.put("nr", nr);
- }
- return map;
- })
- .filter(map -> !map.isEmpty())
- .distinct()
- .collect(Collectors.toList());
-
- for (Map<String, Object> map : maps) {
- String content = " " + map.get("bt") + map.get("nr");
- contents.add(StrUtil.isBlank(content) ? " " : content);
+ LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjCustomer::getCusIdcard, sfzh);
+ wq.like(TjCustomer::getCusName, name);
+ TjCustomer customer = customerService.getOne(wq);
+ if(null != customer){
+ if(!MatchUtils.isMobileNO( phone)){
+ return AjaxResult.error("鎵嬫満鍙蜂笉姝ｇ‘ 璇锋牳瀵瑰悗閲嶆柊杈撳叆!");
+ }
+ customer.setCusPhone( phone);
+ customerService.updateById(customer);
+ return AjaxResult.success("淇敼鎴愬姛!");
}
- return contents;
+ return AjaxResult.error("鏈煡璇㈠埌璇ヤ汉鍛�!");
+
}
}
--
Gitblit v1.8.0