From 0d4a80fd817b39417ad7eee88aa5d14bf571f79c Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期五, 28 六月 2024 17:29:09 +0800
Subject: [PATCH] zjh 本地 2024/06/28 --1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 133 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 124 insertions(+), 9 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index 683b6a5..66c90b8 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -23,6 +23,9 @@
import cn.hutool.core.date.DateUtil;
import cn.hutool.crypto.symmetric.DES;
import cn.hutool.extra.pinyin.PinyinUtil;
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -43,6 +46,7 @@
import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.dto.QianDaoDto;
+import com.ltkj.hosp.hisDto.OutpinimpapplyDto;
import com.ltkj.hosp.mapper.TestMapper;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.sqlDomain.LtkjMiddleDetail;
@@ -63,6 +67,7 @@
import com.ltkj.system.service.ISysUserService;
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.controller.his.HisMzJysqController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -183,7 +188,10 @@
private HisMzJysqController hisMzJysqController;
@Autowired
private HisApiGetMethodService hisApiGetMethodService;
-
+ @Autowired
+ private ISysDeptService sysDeptService;
+ @Autowired
+ private HisApiMethodService controller;
/**
* 鏌ヨ浣撴璁板綍鍒楄〃
@@ -440,9 +448,8 @@
if (null != tjCustomer) {
order.setTjCustomerSex(tjCustomer.getCusSex());
order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
- order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
order.setTjCustomerName(tjCustomer.getCusName());
- order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
+ order.setTjCustomerPhone(tjCustomer.getCusPhone());
// order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
order.setTjCusIdCard(tjCustomer.getCusIdcard());
order.setCareer(tjCustomer.getCareer());
@@ -921,6 +928,11 @@
if (null != mallOrder) tjOrder.setMallOrderId(String.valueOf(mallOrder.getId()));
tjOrder.setStatus(TjConstants.TJ_BEGIN);
tjOrder.setCardId(tjCustomer.getCardId());
+ if(null !=tjOrder.getTjCategory() && tjOrder.getTjCategory().equals("13")){
+ tjOrder.setFinishTime(new Date());
+ tjOrder.setCheckStatus(1);
+ tjOrder.setStatus(TjConstants.TJ_WAIT);
+ }
if (tjOrderService.save(tjOrder)) {
//淇濆瓨鏀惰揣鍦板潃
@@ -1588,9 +1600,9 @@
asyncService.saveRedisTransitionByPacId(cusId, cardId, null, proIds);
for (Long proId : proIds) {
List<TbTransition> transitions = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId));
- if (null != transitions && transitions.size() > 0) {
- continue;
- }
+// if (null != transitions && transitions.size() > 0) {
+// continue;
+// }
TjProject tjProject = projectService.getTjProjectById(String.valueOf(proId));
if (null != tjProject) {
// List<TjProject> tjProSonList = projectService.getTjProjectListBySoneId(String.valueOf(project.getProId()));
@@ -1846,6 +1858,35 @@
TjCustomer customer = tjCustomerService.selectTjCustomerByCusId(tjOrder.getUserId());
customer.setCardId("0");
tjCustomerService.updateById(customer);
+ String config = configService.selectConfigByKey("sfkqdyhis");
+ if(null !=config && config.equals("Y")){
+ final String date = DateUtil.format(tjOrder.getCreateTime(), "yyyy-MM-dd HH:mm:ss");
+ OutpinimpapplyDto dto=new OutpinimpapplyDto();
+ dto.setHisRegistrationId(tjOrder.getCardId());
+ dto.setMzzdid(1);
+ dto.setSqysbm("00029");
+ dto.setMzksbm("0101");
+ dto.setFbrq(date);
+ dto.setZdrq(date);
+ dto.setCzybm("00029");
+ dto.setCzyksbm("0101");
+ dto.setZs("鍋ュ悍鏌ヤ綋");
+ dto.setBs("涓嶈");
+ dto.setClyz("");
+ dto.setJws("");
+ dto.setTgjc("");
+ dto.setGms("");
+ dto.setJbbm("Z00.001");
+ dto.setJbbm1("");
+ dto.setJbbm2("");
+ dto.setFzbz("1");
+ dto.setHzqx("6");
+ dto.setSfqc("0");
+ dto.setQchs("");
+ dto.setSfqj("0");
+ dto.setJzqk(9);
+ controller.Outpinimpapply(dto);
+ }
return AjaxResult.success("绛剧鎴愬姛锛�");
} else {
@@ -1921,6 +1962,7 @@
map.put("proPrantId", entry.getKey().toString());
if (null != pacId) {
TjPackage aPackage = tjPackageService.getById(entry.getValue().get(0).getPacId());
+ map.put("tjCategory",aPackage.getTjCategory());
map.put("pacName", aPackage.getPacName());
TjProject tjProject = projectService.getById(entry.getKey());
// TjPackageProject project = tjPackageProjectService.getOne(new LambdaQueryWrapper<TjPackageProject>().eq(TjPackageProject::getPacId, pacId)
@@ -1933,6 +1975,7 @@
// }
map.put("nowPrice", transitionService.getTbTransitionDxPriceByPac(cusId, entry.getKey(), cardId, pacId));
} else {
+ map.put("tjCategory",null);
map.put("pacName", "鍗曢」");
List<TbTransition> tbTransitionList = entry.getValue();
if (null != tbTransitionList && tbTransitionList.size() > 0) {
@@ -1971,6 +2014,7 @@
map.put("proPrantId", entry.getKey().toString());
if (null != pacId) {
TjPackage aPackage = tjPackageService.getById(entry.getValue().get(0).getPacId());
+ map.put("tjCategory",aPackage.getTjCategory());
map.put("pacName", aPackage.getPacName());
TjProject tjProject = projectService.getById(entry.getKey());
// TjPackageProject project = tjPackageProjectService.getOne(new LambdaQueryWrapper<TjPackageProject>().eq(TjPackageProject::getPacId, pacId)
@@ -1981,8 +2025,9 @@
// } else {
// map.put("nowPrice", tjProject.getProPrice());
// }
- map.put("nowPrice", transitionService.getTbTransitionDxPriceByPac(cusId, entry.getKey(), cardId, pacId));
+ map.put("nowPrice",tjProject.getProPrice());
} else {
+ map.put("tjCategory",null);
map.put("pacName", "鍗曢」");
List<TbTransition> tbTransitionList = entry.getValue();
if (null != tbTransitionList && tbTransitionList.size() > 0) {
@@ -2218,14 +2263,84 @@
return AjaxResult.success(transitionService.remove(wq));
}
+ @GetMapping("/getTransitionInfo")
+ @ApiOperation(value = "鏍规嵁浣撴鍙疯幏鍙栨眹鎬诲拰鏄庣粏鐨勬暟鎹�")
+ public AjaxResult getTransitionInfo(@RequestParam("tjNumber")String tjNumber){
+ QueryWrapper<TbTransition> wrapper = new QueryWrapper<>();
+ wrapper.select("parent_pro_id","parent_pro_name","sum(ord_price) as ord_price")
+ .eq("tj_num",tjNumber)
+ .groupBy("parent_pro_name");
+ List<TbTransition> list = transitionService.list(wrapper);
+ List<Long> parentProIds = list.stream().map(item -> item.getParentProId()).collect(Collectors.toList());
+ LambdaQueryWrapper<TjProject> projectQueryWrapper = new LambdaQueryWrapper<>();
+ projectQueryWrapper.in(TjProject::getProId,parentProIds);
+ List<TjProject> projects = projectService.list(projectQueryWrapper);
+ JSONArray huiZong = JSONUtil.createArray();
+ int index = 1;
+ for (TjProject project : projects) {
+ LambdaQueryWrapper<SysDept> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(SysDept::getDeptId,project.getDeptId());
+ SysDept dept = sysDeptService.getOne(queryWrapper);
+ for (TbTransition tbTransition : list) {
+ if (tbTransition.getParentProId().toString().equals(project.getProId().toString())){
+ JSONObject obj = JSONUtil.createObj();
+ obj.putOpt("index",index++);
+ obj.putOpt("parent_pro_name",tbTransition.getParentProName());
+ obj.putOpt("price",tbTransition.getOrdPrice());
+ obj.putOpt("ks",dept.getDeptName());
+ huiZong.add(obj);
+ }
+ }
+ }
+ wrapper = new QueryWrapper<>();
+ wrapper.eq("tj_num",tjNumber);
+ list = transitionService.list(wrapper);
+ JSONArray info = JSONUtil.createArray();
+ index = 1;
+ for (TbTransition tbTransition : list) {
+ JSONObject obj = JSONUtil.createObj();
+ obj.putOpt("index",index++);
+ obj.putOpt("parent_pro_name",tbTransition.getParentProName());
+ obj.putOpt("pro_name",tbTransition.getProName());
+ BigDecimal ordPrice = tbTransition.getOrdPrice();
+ obj.putOpt("zongjia",ordPrice);
+ QueryWrapper<TjProject> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("pro_id",tbTransition.getProId());
+ TjProject tjProject = projectService.getOne(queryWrapper);
+ Integer num = tjProject.getSl();
+ obj.putOpt("num",num);
+ BigDecimal price = ordPrice.divide(new BigDecimal(num));
+ obj.putOpt("danjia",price);
+ Date createTime = tbTransition.getCreateTime();
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ obj.putOpt("time",dateFormat.format(createTime));
+ info.put(obj);
+ }
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("huizong",huiZong);
+ map.put("info",info);
+ return AjaxResult.success().put("data",map);
+ }
+
public void newSaveextracted(TjOrder tjOrder, TjCustomer tjCustomer, BigDecimal discount, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
tjAskMedicalHistoryService.updateTjAskMedicalHistoryByCusId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjCustomer.getCusId()));
- tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
+ if(null !=tjOrder.getTjCategory() && tjOrder.getTjCategory().equals("13")){
+ tjOrderDetailService.saveJSYTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
+ }else {
+ tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
+ }
+
tjOrderDetailService.saveTjPureToneTesByCusId(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
//淇敼姣忛」鐨勫師浠风幇浠� //淇敼涓存椂琛ㄤ綋妫�鍙�
transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), discount, tjOrder.getTjNumber());
//娣诲姞remark琛ㄦ暟鎹�
- remarkService.saveTjOrderRemarkByOrderId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId()));
+ if(null !=tjOrder.getTjCategory() && tjOrder.getTjCategory().equals("13")){
+ remarkService.saveJSYTjOrderRemarkByOrderId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId()));
+
+ }else {
+ remarkService.saveTjOrderRemarkByOrderId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId()));
+
+ }
//鍒ゆ柇鏄惁浜ら挶
if ("1".equals(tjOrder.getTjType())) {
if (null != tjReservation && tjReservation.getPayType() == 1) {
--
Gitblit v1.8.0