From cbc1828ae240e37a37670f2760b80649c11679e2 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 11 八月 2025 08:58:56 +0800
Subject: [PATCH] zjh20250811
---
ltkj-hosp/src/main/resources/mapper/TjCustomerMapper.xml | 2
ltkj-admin/src/test/java/zjhTest.java | 35 ++++++++
ltkj-framework/src/main/java/com/ltkj/framework/config/MatchUtils.java | 2
ltkj-admin/src/main/java/com/ltkj/web/controller/app/WxloginController.java | 147 ++++++++++++++++++++++++++++++------
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java | 5
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java | 2
7 files changed, 163 insertions(+), 32 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/WxloginController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/WxloginController.java
index 3e5f0f0..d50d0fe 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/WxloginController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/WxloginController.java
@@ -9,19 +9,18 @@
import com.google.gson.reflect.TypeToken;
import com.ltkj.common.core.controller.BaseController;
import com.ltkj.common.core.domain.AjaxResult;
+import com.ltkj.common.core.domain.entity.SysDept;
import com.ltkj.common.utils.StringUtils;
import com.ltkj.common.utils.WechatUtil;
import com.ltkj.common.utils.sign.Base64;
import com.ltkj.framework.config.JwtUtils;
import com.ltkj.framework.config.UserHoder;
-import com.ltkj.hosp.domain.GetPhone;
-import com.ltkj.hosp.domain.TjCustomer;
-import com.ltkj.hosp.domain.TjOrder;
-import com.ltkj.hosp.domain.Wxuser;
+import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.service.IAbucoderWxuserService;
import com.ltkj.hosp.service.ITjCustomerService;
import com.ltkj.hosp.service.ITjOrderRemarkService;
import com.ltkj.hosp.service.ITjOrderService;
+import com.ltkj.system.service.ISysDeptService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -74,6 +73,9 @@
@Resource
private ITjOrderRemarkService remarkService;
+
+ @Resource
+ private ISysDeptService deptService;
@Value("${xcx.appid}")
private String appid;
@@ -213,7 +215,7 @@
wq.eq(Wxuser::getOpenid, wxuser.getOpenid());
Wxuser one = wxuserService.getOne(wq);
// System.out.println("缁戝畾 ->"+wxuser.getOpenid()+",json = "+json);
- if (one != null){
+ if (one != null) {
one.setPhone(phone);
wxuserService.updateById(one);
return AjaxResult.success();
@@ -228,22 +230,22 @@
cn.hutool.json.JSONObject entries = JSONUtil.parseObj(json);
String idCard = entries.getStr("idCard");
TjCustomer tjCustomer = customerService.getTjCustomerByCusIdCard(idCard);
- if(null != tjCustomer){
+ if (null != tjCustomer) {
List<Map<String, Object>> mapList = new ArrayList<>();
- LambdaQueryWrapper<TjOrder> wq=new LambdaQueryWrapper<>();
+ LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
wq.eq(TjOrder::getUserId, tjCustomer.getCusId());
List<TjOrder> list = orderService.list(wq);
- if(null != list && !list.isEmpty()){
+ if (null != list && !list.isEmpty()) {
for (TjOrder order : list) {
Map<String, Object> map = new HashMap<>();
- if(order.getPacId().equals("0")){
- map.put("pacName","鏅�氫綋妫�");
- }else {
- map.put("pacName",orderService.getpacName(order.getPacId()));
+ if (order.getPacId().equals("0")) {
+ map.put("title", "鏅�氫綋妫�");
+ } else {
+ map.put("title", orderService.getpacName(order.getPacId()));
}
- map.put("zjq",orderService.gettjzj(order.getOrderId()));
- map.put("tjsj",order.getCreateTime());
- map.put("tjxm",remarkService.getTjxm(order.getTjNumber()));
+ map.put("price", orderService.gettjzj(order.getOrderId()));
+ map.put("time", order.getCreateTime());
+ map.put("items", remarkService.getTjxm(order.getTjNumber()));
int czwj = remarkService.panduaniscunzaiweijian(order.getTjNumber());
int sfwc = remarkService.panduaniswancheng(order.getTjNumber());
Date checkTime = order.getCheckTime();
@@ -251,25 +253,25 @@
Integer heshouStatus = order.getHeshouStatus();
Date lastTime = order.getPrintLastTime();
if (czwj == 0) {
- map.put("tjzt","鏈");
+ map.put("status", "鏈");
}
if (czwj > 0) {
- map.put("tjzt","鍦ㄦ");
+ map.put("status", "鍦ㄦ");
}
if (sfwc == 0) {
- map.put("tjzt","宸插畬鎴�");
+ map.put("status", "宸插畬鎴�");
}
if (null != checkTime) {
- map.put("tjzt","宸插鏍�");
+ map.put("status", "宸插鏍�");
}
if (null != reportTime) {
- map.put("tjzt","鐢熸垚鎶ュ憡");
+ map.put("status", "鐢熸垚鎶ュ憡");
}
if (1 == heshouStatus) {
- map.put("tjzt","鎶ュ憡鏍告敹");
+ map.put("status", "鎶ュ憡鏍告敹");
}
if (null != lastTime) {
- map.put("tjzt","宸叉墦鍗�");
+ map.put("status", "宸叉墦鍗�");
}
mapList.add(map);
}
@@ -278,6 +280,103 @@
}
return AjaxResult.error("鏆傛棤闂瘖璁板綍");
+ }
+
+
+ @PostMapping("/wx/tijianjilu")
+ @ApiOperation("灏忕▼搴忎綋妫�璁板綍")
+ public AjaxResult tijianjilu(@RequestBody String json) {
+ cn.hutool.json.JSONObject entries = JSONUtil.parseObj(json);
+ String idCard = entries.getStr("idCard");
+ TjCustomer tjCustomer = customerService.getTjCustomerByCusIdCard(idCard);
+ if (null != tjCustomer) {
+ List<Map<String, Object>> mapList = new ArrayList<>();
+ LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjOrder::getUserId, tjCustomer.getCusId());
+ List<TjOrder> list = orderService.list(wq);
+ if (null != list && !list.isEmpty()) {
+ for (TjOrder order : list) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("tjNumber", order.getTjNumber());
+ int czwj = remarkService.panduaniscunzaiweijian(order.getTjNumber());
+ int sfwc = remarkService.panduaniswancheng(order.getTjNumber());
+ Date checkTime = order.getCheckTime();
+ Date reportTime = order.getReportTime();
+ Integer heshouStatus = order.getHeshouStatus();
+ Date lastTime = order.getPrintLastTime();
+ if (czwj == 0) {
+ map.put("status", "鏈");
+ }
+ if (czwj > 0) {
+ map.put("status", "鍦ㄦ");
+ }
+ if (sfwc == 0) {
+ map.put("status", "宸插畬鎴�");
+ }
+ if (null != checkTime) {
+ map.put("status", "宸插鏍�");
+ }
+ if (null != reportTime) {
+ map.put("status", "鐢熸垚鎶ュ憡");
+ }
+ if (1 == heshouStatus) {
+ map.put("status", "鎶ュ憡鏍告敹");
+ }
+ if (null != lastTime) {
+ map.put("status", "宸叉墦鍗�");
+ }
+ mapList.add(map);
+ }
+ return AjaxResult.success(mapList);
+ }
+ }
+
+ return AjaxResult.error("鏆傛棤浣撴璁板綍");
+ }
+
+
+ @PostMapping("/wx/tijianjiluxiangqing")
+ @ApiOperation("灏忕▼搴忎綋妫�璁板綍璇︽儏")
+ public AjaxResult tijianjiluxiangqing(@RequestBody String json) {
+ cn.hutool.json.JSONObject entries = JSONUtil.parseObj(json);
+ String tjNumber = entries.getStr("tjNumber");
+ TjOrder order = orderService.getOrderByTjNum(tjNumber);
+ if (null != order) {
+ TjCustomer tjCustomer = customerService.selectTjCustomerByCusId(order.getUserId());
+ if (null != tjCustomer) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("cusName", tjCustomer.getCusName());
+ map.put("cusSex", tjCustomer.getCusSex());
+ if (order.getPacId().equals("0")) {
+ map.put("pacName", "鏅�氫綋妫�");
+ } else {
+ map.put("pacName", orderService.getpacName(order.getPacId()));
+ }
+ map.put("price", orderService.gettjzj(order.getOrderId()));
+ map.put("createTime", order.getCreateTime());
+
+ List<TjOrderRemark> remarkList = remarkService.getTjOrderRemarkListByTjNum(order.getTjNumber());
+ List<Map<String, Object>> mapList = new ArrayList<>();
+ if (null != remarkList && !remarkList.isEmpty()) {
+ for (TjOrderRemark remark : remarkList) {
+ Map<String, Object> map1 = new HashMap<>();
+ SysDept dept = deptService.getById(remark.getDeptId());
+ if(null != dept){
+ map1.put("deptName", dept.getDeptName());
+ map1.put("officialWeb",dept.getOfficialWeb());
+ }
+ map1.put("checkStatus", remark.getType());
+ mapList.add(map1);
+ }
+ map.put("reportlist", mapList);
+ } else {
+ map.put("reportlist", mapList);
+ }
+ return AjaxResult.success(map);
+
+ }
+ }
+ return AjaxResult.error("鏆傛棤璁板綍");
}
/**
@@ -448,11 +547,11 @@
wq.eq(Wxuser::getOpenid, openId);
Wxuser one = wxuserService.getOne(wq);
- if (one!=null){
+ if (one != null) {
one.setPhone(phone);
one.setUpdateTime(new DateTime());
final boolean b = wxuserService.updateById(one);
- if (b){
+ if (b) {
LambdaQueryWrapper<TjCustomer> qw = new LambdaQueryWrapper<>();
qw.eq(TjCustomer::getCusPhone, phone);
List<TjCustomer> tjCustomer1 = customerService.list(qw);
diff --git a/ltkj-admin/src/test/java/zjhTest.java b/ltkj-admin/src/test/java/zjhTest.java
index 4f48657..bea1f4b 100644
--- a/ltkj-admin/src/test/java/zjhTest.java
+++ b/ltkj-admin/src/test/java/zjhTest.java
@@ -1,4 +1,5 @@
+import cn.hutool.core.date.DateUtil;
import cn.hutool.core.io.FileUtil;
import com.ltkj.LtkjApplication;import com.ltkj.framework.config.MatchUtils;
import com.ltkj.hosp.domain.TjJcycxm;
@@ -22,6 +23,9 @@
import java.math.BigDecimal;
import java.net.HttpURLConnection;
import java.net.URL;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
import java.util.*;
import java.io.BufferedReader;
import java.io.InputStreamReader;
@@ -34,6 +38,8 @@
import java.io.File;
import java.io.IOException;
+import static com.ltkj.framework.config.MatchUtils.getIdCardBirthDayStr;
+import static com.ltkj.framework.config.MatchUtils.isIdCard;
/**
@@ -85,10 +91,37 @@
public static void main(String[] args) throws Exception {
String s = "62272219610528411X";
- System.out.println(isValidIdCard(s) ? "鍚堟硶" : "闈炴硶");
+ System.out.println(getBirthDayByIdCard(s));
}
+
+ public static String getBirthDayByIdCard(String idCard) throws Exception {
+ if (!isIdCard(idCard)) {
+ throw new Exception("韬唤璇佷笉姝ｇ‘");
+ }
+ // 鑾峰彇韬唤璇佺殑鍑虹敓骞存湀鏃ヤ覆
+ String birth = getIdCardBirthDayStr(idCard);
+ // 鑾峰彇骞存湀鏃�
+ int year = Integer.parseInt(birth.substring(0, 4));
+ int month = Integer.parseInt(birth.substring(4, 6));
+ int day = Integer.parseInt(birth.substring(6, 8));
+ String sr = year + "-" + month + "-" + day;
+
+ // 瑙ｆ瀽涓� Date
+ Date date = DateUtil.parse(sr, "yyyy-MM-dd");
+ // 杞崲涓� LocalDateTime
+ LocalDateTime dateTime = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+ // 璁剧疆鍥哄畾鏃跺垎绉�
+ dateTime = dateTime.withHour(12).withMinute(34).withSecond(56);
+
+ // 鏍煎紡鍖栦负瀛楃涓茶繑鍥�
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+ return dateTime.format(formatter);
+ }
+
+
+
public static boolean isValidIdCard(String idCardNumber) {
// 姝ｅ垯琛ㄨ揪寮忥紝鍖归厤韬唤璇佸彿鐮佺殑鏍煎紡
String regex = "(^\\d{15}$)|(^\\d{18}$)|(^\\d{17}(\\d|X|x)$)";
diff --git a/ltkj-framework/src/main/java/com/ltkj/framework/config/MatchUtils.java b/ltkj-framework/src/main/java/com/ltkj/framework/config/MatchUtils.java
index 5952351..c485c86 100644
--- a/ltkj-framework/src/main/java/com/ltkj/framework/config/MatchUtils.java
+++ b/ltkj-framework/src/main/java/com/ltkj/framework/config/MatchUtils.java
@@ -338,7 +338,7 @@
/**
* @desc 閫氳繃韬唤璇佽幏鍙栧嚭鐢熸棩鏈熺殑瀛楃涓�
*/
- private static String getIdCardBirthDayStr(String idCard) {
+ public static String getIdCardBirthDayStr(String idCard) {
// 鑾峰彇韬唤璇佺殑鍑虹敓骞存湀鏃ヤ覆
if (idCard.length() == FIRST_ID_CARD_LENGTH) {
return FIRST_ID_CARD_YEAR + idCard.substring(ID_CARD_YEAR_INDEX, 12);
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
index f59e9e2..ccf3204 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
@@ -329,9 +329,8 @@
List<TjOrderRemark> newpacsJianChaData(String tjnumber);
- @Select(" SELECT CONCAT(CONCAT('鍏�',COUNT(*),'椤�'),': '," +
- "TRIM(GROUP_CONCAT(b.pro_name ORDER BY b.pro_name SEPARATOR ' | '))) AS xmm" +
+ @Select(" SELECT b.pro_name xmm" +
" FROM tj_order_remark a LEFT JOIN tj_project b ON b.pro_id=a.pro_id" +
" WHERE a.tj_number=#{tjNumber} AND a.type !=2 AND a.deleted=0")
- String getTjxm(String tjNumber);
+ List<String> getTjxm(String tjNumber);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java
index 94b9b21..a000da1 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java
@@ -109,5 +109,5 @@
List<TjOrderRemark> newpacsJianChaData(String tjNumber);
- String getTjxm(String tjNumber);
+ List<String> getTjxm(String tjNumber);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java
index 40a370d..110a8e5 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java
@@ -225,7 +225,7 @@
}
@Override
- public String getTjxm(String tjNumber) {
+ public List<String> getTjxm(String tjNumber) {
return mapper.getTjxm(tjNumber);
}
diff --git a/ltkj-hosp/src/main/resources/mapper/TjCustomerMapper.xml b/ltkj-hosp/src/main/resources/mapper/TjCustomerMapper.xml
index edf3ce8..bbc72e2 100644
--- a/ltkj-hosp/src/main/resources/mapper/TjCustomerMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/TjCustomerMapper.xml
@@ -96,7 +96,7 @@
<select id="selectTjCustomerByCusId" parameterType="Long" resultMap="TjCustomerResult">
<include refid="selectTjCustomerVo"/>
- where cus_id = #{cusId} and deleted = '0'
+ where cus_id = #{cusId}
</select>
<insert id="insertTjCustomer" parameterType="TjCustomer" useGeneratedKeys="true" keyProperty="cusId">
--
Gitblit v1.8.0