From 67aad90d4269515c3a067c30bce3c372d9981a08 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 26 七月 2024 18:15:13 +0800
Subject: [PATCH] zjh 2024/07/26-1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java | 87 +++++++--------------
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java | 6 +
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDiscardInspectionController.java | 10 +-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 6
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java | 31 +++++++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java | 37 ++++++++-
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java | 5 +
7 files changed, 113 insertions(+), 69 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java
index be9a9cc..d4fda5e 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java
@@ -335,7 +335,6 @@
@ApiOperation(value = "灏忕▼搴�-浣撴鎶ュ憡鏌ヨ璇︽儏")
public AjaxResult getShenGaoTiZhong(@RequestParam @ApiParam(value = "浣撴鍙�") String tjNumber) {
Map<String, Object> objectMap = new HashMap<>();
- List<Map<String, Object>> list = new ArrayList<>();
LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
wq1.eq(TjOrder::getTjNumber, tjNumber);
wq1.eq(TjOrder::getCheckStatus, 1);
@@ -344,62 +343,38 @@
return AjaxResult.success("浣撴鏆傛湭瀹屾垚锛侊紒");
}
- LambdaQueryWrapper<TjOrderDetail> wq = new LambdaQueryWrapper<>();
- wq.eq(TjOrderDetail::getOrderId, one.getOrderId());
- wq.in(TjOrderDetail::getProId, "1633660948860522524");
- final TjOrderDetail one1 = detailService.getOne(wq);
- if (one1 == null) {
- objectMap.put("shenggao", "鏃�");
- } else {
- objectMap.put("shenggao", one1.getProResult());
- }
+ List<Map<String, Object>> maps = detailService.getShenGaoTiZhongList(one.getTjNumber());
+// if(null !=maps && maps.size()>0){
+// for (Map<String, Object> map : maps) {
+// if (map.get("") == null) {
+// objectMap.put("shenggao", "鏃�");
+// } else {
+// objectMap.put("shenggao", one1.getProResult());
+// }
+// if (one2 == null) {
+// objectMap.put("tizhong", "鏃�");
+// } else {
+// objectMap.put("tizhong", one2.getProResult());
+// }
+// if (one3 == null) {
+// objectMap.put("tizhongzhishu", "鏃�");
+// } else {
+// objectMap.put("tizhongzhishu", one3.getProResult());
+// }
+// if (one4 == null) {
+// objectMap.put("shousuoya", "鏃�");
+// } else {
+// objectMap.put("shousuoya", one4.getProResult());
+// }
+// if (one5 == null) {
+// objectMap.put("shuzhangya", "鏃�");
+// } else {
+// objectMap.put("shuzhangya", one5.getProResult());
+// }
+// }
+// }
-
- LambdaQueryWrapper<TjOrderDetail> wq2 = new LambdaQueryWrapper<>();
- wq2.eq(TjOrderDetail::getOrderId, one.getOrderId());
- wq2.in(TjOrderDetail::getProId, "1633660948860522525");
- final TjOrderDetail one2 = detailService.getOne(wq2);
- if (one2 == null) {
- objectMap.put("tizhong", "鏃�");
- } else {
- objectMap.put("tizhong", one2.getProResult());
- }
-
-
- LambdaQueryWrapper<TjOrderDetail> wq3 = new LambdaQueryWrapper<>();
- wq3.eq(TjOrderDetail::getOrderId, one.getOrderId());
- wq3.in(TjOrderDetail::getProId, "1633660948860522526");
- final TjOrderDetail one3 = detailService.getOne(wq3);
- if (one3 == null) {
- objectMap.put("tizhongzhishu", "鏃�");
- } else {
- objectMap.put("tizhongzhishu", one3.getProResult());
- }
-
-
- LambdaQueryWrapper<TjOrderDetail> wq4 = new LambdaQueryWrapper<>();
- wq4.eq(TjOrderDetail::getOrderId, one.getOrderId());
- wq4.in(TjOrderDetail::getProId, "1633660948860522527");
- final TjOrderDetail one4 = detailService.getOne(wq4);
- if (one4 == null) {
- objectMap.put("shousuoya", "鏃�");
- } else {
- objectMap.put("shousuoya", one4.getProResult());
- }
-
-
- LambdaQueryWrapper<TjOrderDetail> wq5 = new LambdaQueryWrapper<>();
- wq5.eq(TjOrderDetail::getOrderId, one.getOrderId());
- wq5.in(TjOrderDetail::getProId, "1633660948860522528");
- final TjOrderDetail one5 = detailService.getOne(wq5);
- if (one5 == null) {
- objectMap.put("shuzhangya", "鏃�");
- } else {
- objectMap.put("shuzhangya", one5.getProResult());
- }
-
-
- return AjaxResult.success(objectMap);
+ return AjaxResult.success(maps);
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index 88019a4..a7e283a 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -297,7 +297,7 @@
tjOrder.setConfirmStatus(String.valueOf(status));
if (status == 0) {
tjOrder.setStatus(TjConstants.TJ_CHECK);
- asyncService.updateCheckType(tjNumber);
+// asyncService.updateCheckType(tjNumber);
} else {
tjOrder.setStatus(TjConstants.TJ_REFUSED);
}
@@ -307,8 +307,8 @@
confirmLog.setTjNum(tjNumber);
confirmLog.setStatus(status);
confirmLogService.save(confirmLog);
- asyncService.wCScheckSetCustomerLisByRedis(orderService.getCsTjOrderList(tjNumber, 0, null, null, null));
- asyncService.yCScheckSetCustomerLisByRedis(orderService.getCsTjOrderList(tjNumber, 1, null, null, null));
+// asyncService.wCScheckSetCustomerLisByRedis(orderService.getCsTjOrderList(tjNumber, 0, null, null, null));
+// asyncService.yCScheckSetCustomerLisByRedis(orderService.getCsTjOrderList(tjNumber, 1, null, null, null));
return AjaxResult.success("鎿嶄綔鎴愬姛");
}
return AjaxResult.error("鎿嶄綔澶辫触");
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 c8131c0..1626a30 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
@@ -227,7 +227,7 @@
tjCustomer1.setTjType(tjReservation.getTjType());
tjCustomer1.setCusName(tjReservation.getName());
tjCustomer1.setCusSex(Long.valueOf(tjReservation.getSex()));
- tjCustomer1.setCusBrithday(tjReservation.getBirthday());
+ tjCustomer1.setCusBrithday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjReservation.getIdCard()), "yyyy-MM-dd"));
tjCustomer1.setCusPhone(tjReservation.getPhoe());
tjCustomer1.setCusEmail(tjReservation.getEmail());
tjCustomer1.setCusAddr(tjReservation.getAddress());
@@ -239,7 +239,33 @@
tjCustomer1.setAgeUnit(tjReservation.getAgeUnit());
tjCustomer1.setCareer(tjReservation.getCareer());
tjCustomer1.setPym(PinyinUtil.getFirstLetter(tjReservation.getName(),""));
- tjCustomerService.updateById(tjCustomer1);
+ if (null != key && key.equals("Y"))
+ {
+ AjaxResult result = controller.Outpincreateapply(tjCustomer1);
+ String result1 = getAjaxResult(result);
+ 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) {
+ tjCustomer1.setPationId(pationid);
+ tjCustomerService.updateById(tjCustomer1);
+ //淇濆瓨娉ㄥ唽鍏ュ弬鍑哄弬
+ resultData.put("cardId",pationid);
+ JSONObject object4 = JSONUtil.parseObj(resultData);
+ LambdaQueryWrapper<HisApiConfig> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, "Outpincreateapply");
+ HisApiConfig hisApiConfig = hisApiConfigService.getOne(lambdaQueryWrapper);
+ hisApiGetMethodService.save(object4, "Outpincreateapply", hisApiConfig, JSONUtil.toJsonStr(BeanUtil.beanToMap(tjCustomer1)));
+ }
+ }
+ }
+ }else {
+ tjCustomerService.updateById(tjCustomer1);
+ }
tjCustomer1.setTeamNo(tjReservation.getTeamNo());
tjCustomer1.setCompId(tjReservation.getCompanyId());
tjCustomer1.setReservationId(tjReservation.getId());
@@ -251,7 +277,7 @@
tjCustomer.setCusIdcard(tjReservation.getIdCard());
tjCustomer.setCusName(tjReservation.getName());
tjCustomer.setCusSex(Long.valueOf(tjReservation.getSex()));
- tjCustomer.setCusBrithday(tjReservation.getBirthday());
+ tjCustomer.setCusBrithday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjReservation.getIdCard()), "yyyy-MM-dd"));
tjCustomer.setCusPhone(tjReservation.getPhoe());
tjCustomer.setCusEmail(tjReservation.getEmail());
tjCustomer.setCusAddr(tjReservation.getAddress());
@@ -271,7 +297,6 @@
tjCustomer.setCusPassword(substring);
tjCustomer.setTjType(tjReservation.getTjType());
tjCustomer.setPym(PinyinUtil.getFirstLetter(tjReservation.getName(),""));
- tjCustomerService.save(tjCustomer);
if (null != key && key.equals("Y"))
{
AjaxResult result = controller.Outpincreateapply(tjCustomer);
@@ -285,7 +310,7 @@
String pationid = resultData.get("PationId").toString();
if (null != pationid) {
tjCustomer.setPationId(pationid);
- tjCustomerService.updateById(tjCustomer);
+ tjCustomerService.save(tjCustomer);
//淇濆瓨娉ㄥ唽鍏ュ弬鍑哄弬
resultData.put("cardId",pationid);
JSONObject object4 = JSONUtil.parseObj(resultData);
@@ -296,6 +321,8 @@
}
}
}
+ }else {
+ tjCustomerService.save(tjCustomer);
}
tjCustomer.setTeamNo(tjReservation.getTeamNo());
tjCustomer.setCompId(tjReservation.getCompanyId());
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDiscardInspectionController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDiscardInspectionController.java
index da2382a..9eaca30 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDiscardInspectionController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDiscardInspectionController.java
@@ -44,11 +44,11 @@
public TableDataInfo list(TjDiscardInspection tjDiscardInspection) {
startPage();
List<TjDiscardInspection> list = tjDiscardInspectionService.selectTjDiscardInspectionList(tjDiscardInspection);
- if (null != list && list.size() > 0) {
- for (TjDiscardInspection discardInspection : list) {
- discardInspection.setCusName(MatchUtils.hideCusName(discardInspection.getCusName()));
- }
- }
+// if (null != list && list.size() > 0) {
+// for (TjDiscardInspection discardInspection : list) {
+// discardInspection.setCusName(MatchUtils.hideCusName(discardInspection.getCusName()));
+// }
+// }
return getDataTable(list);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
index f244232..5d3d2f5 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
@@ -1,6 +1,7 @@
package com.ltkj.hosp.mapper;
import java.util.List;
+import java.util.Map;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ltkj.hosp.domain.TjOrderDetail;
@@ -194,4 +195,34 @@
" from tj_order_detail\n" +
" where jxbz = #{jxbz}")
void deleteTjOrderDetailByjxbz(String jxbz);
+
+
+
+
+ @Select("SELECT\n" +
+ "\tIFNULL(SUM(CASE WHEN aa.mc LIKE '%韬珮%' THEN aa.jg END),'鏃�') shenggao,\n" +
+ "\tIFNULL(SUM(CASE WHEN aa.mc LIKE '%浣撻噸%' THEN aa.jg END),'鏃�') tizhong,\n" +
+ "\tIFNULL(SUM(CASE WHEN aa.mc LIKE '%鎸囨暟%' THEN aa.jg END),'鏃�') tizhongzhishu,\n" +
+ "\tIFNULL(SUM(CASE WHEN aa.mc LIKE '%鏀剁缉鍘�%' THEN aa.jg END),'鏃�') shousuoya,\n" +
+ "\tIFNULL(SUM(CASE WHEN aa.mc LIKE '%鑸掑紶鍘�%' THEN aa.jg END),'鏃�') shuzhangya\n" +
+ "FROM\n" +
+ "\t(\n" +
+ "\tSELECT\n" +
+ "\t\tc.pro_name mc,\n" +
+ "\t\tb.pro_result jg \n" +
+ "\tFROM\n" +
+ "\t\ttj_order a\n" +
+ "\t\tJOIN tj_order_detail b ON a.order_id = b.order_id\n" +
+ "\t\tJOIN tj_project c ON c.pro_id = b.pro_id \n" +
+ "\tWHERE\n" +
+ "\t\ta.tj_number =#{tjNum} \n" +
+ "\t\tAND c.pro_parent_id != 0 \n" +
+ "\t\tAND (\n" +
+ "\t\t\tc.pro_name LIKE '%韬珮%' \n" +
+ "\t\t\tOR c.pro_name LIKE '%浣撻噸%' \n" +
+ "\t\t\tOR c.pro_name LIKE '%鎸囨暟%' \n" +
+ "\t\t\tOR c.pro_name LIKE '%鏀剁缉鍘�%' \n" +
+ "\t\tOR c.pro_name LIKE '%鑸掑紶鍘�%' \n" +
+ "\t)) aa ")
+ List<Map<String,Object>> getShenGaoTiZhongList(String tjNum);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java
index fc12434..67eb13d 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java
@@ -1,6 +1,7 @@
package com.ltkj.hosp.service;
import java.util.List;
+import java.util.Map;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ltkj.common.core.domain.entity.SysUser;
@@ -111,4 +112,8 @@
List<TjOrderDetail> addHuaYanAndCgTable(String tjnumber);
void deleteTjOrderDetailByjxbz(String jxbz);
+
+
+
+ List<Map<String,Object>> getShenGaoTiZhongList(String tjNum);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java
index e7b88c0..1517ba1 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java
@@ -1,6 +1,7 @@
package com.ltkj.hosp.service.impl;
import java.util.List;
+import java.util.Map;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ltkj.common.core.domain.entity.SysUser;
@@ -184,4 +185,9 @@
tjOrderDetailMapper.deleteTjOrderDetailByjxbz(jxbz);
}
+ @Override
+ public List<Map<String, Object>> getShenGaoTiZhongList(String tjNum) {
+ return tjOrderDetailMapper.getShenGaoTiZhongList(tjNum);
+ }
+
}
--
Gitblit v1.8.0