From aa33bb96ba9f14b16c6c7832e21bfbd88983ba6d Mon Sep 17 00:00:00 2001 From: zjh <1084500556@qq.com> Date: 星期三, 24 一月 2024 18:02:39 +0800 Subject: [PATCH] zjh 2024/01/24--3 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 525 +++++++++++++++++++++++++++++++++++----------------------- 1 files changed, 315 insertions(+), 210 deletions(-) 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 dc2ccb9..99df97c 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 @@ -5,14 +5,20 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ltkj.common.annotation.RepeatSubmit; import com.ltkj.common.core.domain.AjaxResult; import com.ltkj.common.core.domain.entity.SysUser; import com.ltkj.common.core.redis.RedisCache; +import com.ltkj.common.enums.DataSourceType; import com.ltkj.common.utils.SecurityUtils; import com.ltkj.common.utils.StringUtils; import com.ltkj.framework.config.MatchUtils; +import com.ltkj.framework.config.UserHoder; +import com.ltkj.framework.datasource.DynamicDataSourceContextHolder; import com.ltkj.hosp.domain.*; +import com.ltkj.hosp.mapper.TestMapper; import com.ltkj.hosp.service.*; +import com.ltkj.hosp.sqlDomain.*; import com.ltkj.hosp.vodomain.CsProVo; import com.ltkj.hosp.vodomain.UpdateOrderRemarkVo; import com.ltkj.mall.mallOrderUtils.TjConstants; @@ -31,6 +37,9 @@ import javax.annotation.Resource; import java.util.*; import java.util.stream.Collectors; + +import static org.apache.poi.hemf.record.emfplus.HemfPlusRecordType.save; +import static org.apache.poi.hemf.record.emfplus.HemfPlusRecordType.setClipRect; /** * @Author: 瑗垮畨璺嘲绉戞妧鏈夐檺鍏徃/璧典匠璞� @@ -70,6 +79,22 @@ private ISysConfigService configService; @Resource private ISysDeptService deptService; + @Resource + private TestMapper testMapper; + @Resource + private TjvLtkjvtjpatService tjvLtkjvtjpatService; + @Resource + private LtkjMiddleDetailService middleDetailService; + @Resource + private LtkjMiddleHeadService headService; + @Resource + private LtkjExamJcbgdService ltkjExamJcbgdService; + @Resource + private LtkjExamJcsqdService ltkjExamJcsqdService; + @Resource + private LtkjHybgdService ltkjHybgdService; + @Resource + private LtkjHysqdService ltkjHysqdService; @GetMapping("/getOperationPermissionsByTjNum") @@ -101,82 +126,89 @@ @ApiParam(value = "寮�濮嬫椂闂�") @RequestParam(required = false) String beginTime, @ApiParam(value = "缁撴潫鏃堕棿") @RequestParam(required = false) String endTime) { - DateTime beginTimes = null; - DateTime endTimes = null; - if (null != beginTime && null != endTime) { - beginTimes = DateUtil.beginOfDay(DateUtil.parse(beginTime)); - endTimes = DateUtil.endOfDay(DateUtil.parse(endTime)); - } - //鍒濆鍖栦綋妫�璁㈠崟琛� - List<TjOrder> orderList = null; - List<TjCustomer> customerList = new ArrayList<>(); - Map<String, Object> map = new HashMap<>(); - - if (checkStatus == 0) - asyncService.wCScheckSetCustomerLisByRedis(orderService.getCsTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes)); - if (checkStatus == 1) - asyncService.yCScheckSetCustomerLisByRedis(orderService.getCsTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes)); - - //鏍规嵁濮撳悕鏌ヨ - if (null != name && !"".equals(name)) { - List<TjCustomer> list = customerService.getTjCustomerList(name); - if (null != list && list.size() > 0) { - List<TjCustomer> lists = new ArrayList<>(); - for (TjCustomer customer : list) { - orderList = orderService.getCsTjOrderListByCusId(customer.getCusId()); - if (null != orderList && orderList.size() > 0) { - for (TjOrder tjOrder : orderList) { - customer.setTjNumber(tjOrder.getTjNumber()); - customer.setTjStatus(Long.valueOf(tjOrder.getCheckStatus())); - customer.setOrderId(tjOrder.getOrderId()); - customer.setTjTime(tjOrder.getCreateTime()); - customer.setFinishTime(tjOrder.getFinishTime()); - customer.setCusName(MatchUtils.hideCusName(customer.getCusName())); - customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone())); - customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard())); - customer.setConfirmStatus(String.valueOf(tjOrder.getStatus())); - if (tjOrder.getFirmId().equals("0")) { - customer.setTjCompName(null); - } else { - customer.setTjCompName(compService.selectDictCompByDrugManufacturerId(tjOrder.getFirmId()).getCnName()); - } - lists.add(customer); - } - } - } - List<TjCustomer> customers = null; - if (lists.size() > 0) { - customers = lists.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); - } - map.put("customers", customers); - map.put("total", lists.size()); - return AjaxResult.success(map); - } - return AjaxResult.success("鏆傛棤鏁版嵁"); - } - - //鏉′欢鏌ヨ - if (null != tjNumber || null != compId || (null != beginTime && null != endTime)) { - orderList = orderService.getCsTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes); - return getResult(page, pageSize, orderList, customerList, map); - } - - List<TjCustomer> customers = null; - if (checkStatus == 0) { - customers = redisCache.getCacheMapValue("cScheck", "ws"); - } - if (checkStatus == 1) { - customers = redisCache.getCacheMapValue("cScheck", "ys"); - } - if (customers != null && customers.size() > 0) { - List<TjCustomer> customerLists = customers.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); - map.put("customers", customerLists); - map.put("total", customers.size()); - return AjaxResult.success(map); - } else { - orderList = orderService.getCsTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes); - return getResult(page, pageSize, orderList, customerList, map); - } +// DateTime beginTimes = null; +// DateTime endTimes = null; +// if (null != beginTime && null != endTime) { +// beginTimes = DateUtil.beginOfDay(DateUtil.parse(beginTime)); +// endTimes = DateUtil.endOfDay(DateUtil.parse(endTime)); +// } +// //鍒濆鍖栦綋妫�璁㈠崟琛� +// List<TjOrder> orderList = null; +// List<TjCustomer> customerList = new ArrayList<>(); +// Map<String, Object> map = new HashMap<>(); +// +// if (checkStatus == 0) +// asyncService.wCScheckSetCustomerLisByRedis(orderService.getCsTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes)); +// if (checkStatus == 1) +// asyncService.yCScheckSetCustomerLisByRedis(orderService.getCsTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes)); +// +// //鏍规嵁濮撳悕鏌ヨ +// if (null != name && !"".equals(name)) { +// List<TjCustomer> list = customerService.getTjCustomerList(name); +// if (null != list && list.size() > 0) { +// List<TjCustomer> lists = new ArrayList<>(); +// for (TjCustomer customer : list) { +// orderList = orderService.getCsTjOrderListByCusId(customer.getCusId()); +// if (null != orderList && orderList.size() > 0) { +// for (TjOrder tjOrder : orderList) { +// customer.setTjNumber(tjOrder.getTjNumber()); +// customer.setTjStatus(Long.valueOf(tjOrder.getCheckStatus())); +// customer.setOrderId(tjOrder.getOrderId()); +// customer.setTjTime(tjOrder.getCreateTime()); +// customer.setFinishTime(tjOrder.getFinishTime()); +// customer.setCusName(MatchUtils.hideCusName(customer.getCusName())); +// customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone())); +// customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard())); +// customer.setConfirmStatus(String.valueOf(tjOrder.getStatus())); +// if (tjOrder.getFirmId().equals("0")) { +// customer.setTjCompName(null); +// } else { +// customer.setTjCompName(compService.selectDictCompByDrugManufacturerId(tjOrder.getFirmId()).getCnName()); +// } +// lists.add(customer); +// } +// } +// } +// List<TjCustomer> customers = null; +// if (lists.size() > 0) { +// customers = lists.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); +// } +// map.put("customers", customers); +// map.put("total", lists.size()); +// return AjaxResult.success(map); +// } +// return AjaxResult.success("鏆傛棤鏁版嵁"); +// } +// +// //鏉′欢鏌ヨ +// if (null != tjNumber || null != compId || (null != beginTime && null != endTime)) { +// orderList = orderService.getCsTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes); +// return getResult(page, pageSize, orderList, customerList, map); +// } +// +// List<TjCustomer> customers = null; +// if (checkStatus == 0) { +// customers = redisCache.getCacheMapValue("cScheck", "ws"); +// } +// if (checkStatus == 1) { +// customers = redisCache.getCacheMapValue("cScheck", "ys"); +// } +// if (customers != null && customers.size() > 0) { +// List<TjCustomer> customerLists = customers.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); +// map.put("customers", customerLists); +// map.put("total", customers.size()); +// return AjaxResult.success(map); +// } else { +// orderList = orderService.getCsTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes); +// return getResult(page, pageSize, orderList, customerList, map); +// } + String value = String.valueOf(compId); + if (tjNumber == null) tjNumber = ""; + if (compId == null) value = ""; + if (name == null) name = ""; + if (beginTime == null) beginTime = ""; + if (endTime == null) endTime = ""; + return AjaxResult.success(orderService.getCsCunChuGuoChengCustomerList(tjNumber, page, pageSize, checkStatus, value, beginTime, endTime, name)); } @@ -186,27 +218,37 @@ @GetMapping("/cSWebGetProByTjNumAndOrderId") @ApiOperation(value = "(鍒濆椤甸潰)鐐瑰嚮浣撴浜哄憳灞曠ず浣撴椤圭洰鎺ュ彛") public AjaxResult cSWebGetProByTjNumAndOrderId(@ApiParam(value = "浣撴鍙�") @RequestParam String tjNumber) { - List<TjOrderRemark> orderRemarkList = orderRemarkService.getTjOrderRemarkListByTjNum(tjNumber); - List<CsProVo> list = new ArrayList<>(); - if (null != orderRemarkList && orderRemarkList.size() > 0) { - for (TjOrderRemark remark : orderRemarkList) { - CsProVo vo = new CsProVo(); - vo.setDeptName(deptService.getById(remark.getDeptId()).getDeptName()); - vo.setProName(projectService.getById(remark.getProId()).getProName()); - vo.setType(remark.getType()); - if (null != remark.getDoctorName()) { - vo.setDoctorName(userService.getById(remark.getDoctorName()).getNickName()); - vo.setBcdoctorName(userService.getById(remark.getDoctorName()).getNickName()); - } - vo.setSffs("缁熸敹"); - vo.setIsPay("宸叉敹璐�"); - vo.setQdcreateTime(remark.getCreateTime()); - vo.setBcupdateTime(remark.getUpdateTime()); - vo.setZhupdateTime(remark.getUpdateTime()); - list.add(vo); - } +// List<TjOrderRemark> orderRemarkList = orderRemarkService.getTjOrderRemarkListByTjNum(tjNumber); +// List<CsProVo> list = new ArrayList<>(); +// if (null != orderRemarkList && orderRemarkList.size() > 0) { +// for (TjOrderRemark remark : orderRemarkList) { +// CsProVo vo = new CsProVo(); +// vo.setDeptName(deptService.getById(remark.getDeptId()).getDeptName()); +// vo.setProName(projectService.getById(remark.getProId()).getProName()); +// vo.setType(remark.getType()); +// if (null != remark.getDoctorName()) { +// vo.setDoctorName(userService.getById(remark.getDoctorName()).getNickName()); +// vo.setBcdoctorName(userService.getById(remark.getDoctorName()).getNickName()); +// } +// vo.setSffs("缁熸敹"); +// vo.setIsPay("宸叉敹璐�"); +// vo.setQdcreateTime(remark.getCreateTime()); +// vo.setBcupdateTime(remark.getUpdateTime()); +// vo.setZhupdateTime(remark.getUpdateTime()); +// list.add(vo); +// } +// List<CsProVo> list1 = orderRemarkService.cSWebGetProByTjNumAndOrderId(tjNumber); +// Collections.sort(list, new Comparator<CsProVo>() { +// @Override +// public int compare(CsProVo o1, CsProVo o2) { +// return o1.getType() - o2.getType(); +// } +// }); +// } - Collections.sort(list, new Comparator<CsProVo>() { + List<CsProVo> list = orderRemarkService.cSWebGetProByTjNumAndOrderId(tjNumber); + if (null != list && list.size() > 0) { + list.sort(new Comparator<CsProVo>() { @Override public int compare(CsProVo o1, CsProVo o2) { return o1.getType() - o2.getType(); @@ -222,7 +264,6 @@ */ @GetMapping("/confirmOrder") @ApiOperation(value = "鍒濆(骞朵慨鏀圭姸鎬�)鎺ュ彛") -// @PreAuthorize("@ss.hasPermi('check:check:confirmOrder')") @Transactional public AjaxResult confirmOrder(@ApiParam(value = "tjNumber") @RequestParam String tjNumber, @ApiParam(value = "鐘舵�� 0鍚屾剰 1鎷掔粷 榛樿鍚屾剰") @RequestParam(defaultValue = "0") Integer status, @@ -232,13 +273,11 @@ if (null != tjNumber) { Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId()); SysUser sysUser = userService.getById(userId); - LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>(); - wq1.eq(TjOrder::getTjNumber, tjNumber); - TjOrder tjOrder = orderService.getOne(wq1); + TjOrder tjOrder = orderService.getOrderByTjNum(tjNumber); if (null != tjOrder) { tjOrder.setConfirmTime(new DateTime()); tjOrder.setConfirmDoctor(sysUser.getNickName()); - tjOrder.setConfirmStatus(remark); + tjOrder.setConfirmStatus(String.valueOf(status)); if (status == 0) { tjOrder.setStatus(TjConstants.TJ_CHECK); asyncService.updateCheckType(tjNumber); @@ -251,6 +290,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)); return AjaxResult.success("鎿嶄綔鎴愬姛"); } return AjaxResult.error("鎿嶄綔澶辫触"); @@ -262,16 +303,58 @@ /** + * 鍚屾sql server鏁版嵁鍒版湰鍦版暟鎹簱鏁版嵁鎺ュ彛 + */ + @GetMapping("/dataSynchronization") + @ApiOperation(value = "鍚屾sql server鏁版嵁鍒版湰鍦版暟鎹簱鏁版嵁鎺ュ彛") + @RepeatSubmit + public AjaxResult dataSynchronization(@RequestParam String tjNumber) { + //鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�2023.12.12 + final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData"); + if ("Y".equals(getInfoFromSqlData)) { + TjOrder order = orderService.getOrderByTjNum(tjNumber); + if (null != order) { + List<LtkjHysqd> one = testMapper.getHysqdByTmh(order.getCardId()); + if (one != null && one.size() > 0) { + DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name()); + ltkjHysqdService.saveBatch(one); + DynamicDataSourceContextHolder.clearDataSourceType(); + for (LtkjHysqd ltkjHysqd : one) { + List<LtkjHybgd> one1 = testMapper.getHybgdByTmh(ltkjHysqd.getTmh()); + if (one1 != null && one1.size() > 0) { + DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name()); + ltkjHybgdService.saveBatch(one1); + DynamicDataSourceContextHolder.clearDataSourceType(); + } + } + } + +// List<LtkjExamJcsqd> one2 = testMapper.getExamJcsqdTmh(tjNumber); +// if (one2 != null && one2.size() > 0) { +// DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name()); +// ltkjExamJcsqdService.saveBatch(one2); +// DynamicDataSourceContextHolder.clearDataSourceType(); +// for (LtkjExamJcsqd ltkjExamJcsqd : one2) { +// List<LtkjExamJcbgd> one3 = testMapper.getExamJcbgdByTjh(ltkjExamJcsqd.getTmh()); +// if (one3 != null && one3.size() > 0) { +// DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name()); +// ltkjExamJcbgdService.saveBatch(one3); +// DynamicDataSourceContextHolder.clearDataSourceType(); +// } +// } +// } + //鍚屾鍖栭獙椤圭洰 + testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()),order.getTjNumber(),UserHoder.getLoginUser().getUserId()); + //鍚屾妫�鏌ラ」鐩� + testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()),order.getTjNumber(),UserHoder.getLoginUser().getUserId()); + } + } + return AjaxResult.success("鍚屾鎴愬姛"); + } + + + /** * 鏌ヨ浣撴璁板綍瀹㈡埛鍒楄〃 - * - * @param tjNumber - * @param checkStatus - * @param page - * @param pageSize - * @param compId - * @param beginTime - * @param endTime - * @return */ @GetMapping("/getList") @ApiOperation(value = "鏌ヨ浣撴璁板綍瀹㈡埛鍒楄〃")//0寰�1宸� @@ -284,95 +367,102 @@ @ApiParam(value = "濮撳悕)") @RequestParam(required = false) String name, @ApiParam(value = "寮�濮嬫椂闂�") @RequestParam(required = false) String beginTime, @ApiParam(value = "缁撴潫鏃堕棿") @RequestParam(required = false) String endTime) { - - String config = configService.selectConfigByKey("tj_confirm"); - DateTime beginTimes = null; - DateTime endTimes = null; - if (null != beginTime && null != endTime) { - beginTimes = DateUtil.beginOfDay(DateUtil.parse(beginTime)); - endTimes = DateUtil.endOfDay(DateUtil.parse(endTime)); - } - asyncService.checkSetCustomerLisByRedis(config); - //鍒濆鍖栦綋妫�璁㈠崟琛� - List<TjOrder> orderList = null; - List<TjCustomer> customerList = new ArrayList<>(); - Map<String, Object> map = new HashMap<>(); - - //濮撳悕鏌ヨ - if (null != name && !"".equals(name)) { - List<TjCustomer> list = customerService.getTjCustomerList(name); - if (null != list && list.size() > 0) { - List<TjCustomer> lists = new ArrayList<>(); - for (TjCustomer customer : list) { - if ("Y".equals(config)) { - orderList = orderService.getCsTjOrderListByCusId1(customer.getCusId()); - } else { - orderList = orderService.getTjOrderListByCusId(customer.getCusId()); - } - if (null != orderList && orderList.size() > 0) { - for (TjOrder tjOrder : orderList) { - customer.setTjNumber(tjOrder.getTjNumber()); - customer.setTjStatus(Long.valueOf(tjOrder.getCheckStatus())); - customer.setOrderId(tjOrder.getOrderId()); - customer.setTjTime(tjOrder.getFinishTime()); - customer.setFinishTime(tjOrder.getFinishTime()); - customer.setCusName(MatchUtils.hideCusName(customer.getCusName())); - customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone())); - customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard())); - customer.setConfirmStatus(String.valueOf(tjOrder.getStatus())); - if (tjOrder.getFirmId().equals("0")) { - customer.setTjCompName(null); - } else { - customer.setTjCompName(compService.selectDictCompByDrugManufacturerId(tjOrder.getFirmId()).getCnName()); - } - lists.add(customer); - } - } - } - List<TjCustomer> customers = null; - if (lists.size() > 0) { - customers = lists.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); - } - map.put("customers", customers); - map.put("total", lists.size()); - return AjaxResult.success(map); - } - return AjaxResult.success("鏆傛棤鏁版嵁"); - } - - //鏉′欢鏌ヨ - if (null != tjNumber || null != compId || (null != beginTime && null != endTime)) { - //鍒ゆ柇鏄惁寮�鍚垵瀹� - if ("Y".equals(config)) { - orderList = orderService.getCsTjOrderList1(tjNumber, checkStatus, compId, beginTimes, endTimes); - } else { - orderList = orderService.getTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes); - } - return getResult(page, pageSize, orderList, customerList, map); - } - - List<TjCustomer> customers = null; - if (null != checkStatus && checkStatus == 0) { - customers = redisCache.getCacheMapValue("check", "ws"); - } - if (null != checkStatus && checkStatus == 1) { - customers = redisCache.getCacheMapValue("check", "ys"); - } - if (customers != null && customers.size() > 0) { - asyncService.addRedis(customers); - List<TjCustomer> customerLists = customers.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); - map.put("customers", customerLists); - map.put("total", customers.size()); - return AjaxResult.success(map); - } else { - //鍒ゆ柇鏄惁寮�鍚垵瀹� - if ("Y".equals(config)) { - orderList = orderService.getCsTjOrderList1(tjNumber, checkStatus, compId, beginTimes, endTimes); - } else { - orderList = orderService.getTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes); - } - return getResult(page, pageSize, orderList, customerList, map); - } + // String config = configService.selectConfigByKey("tj_confirm"); +// DateTime beginTimes = null; +// DateTime endTimes = null; +// if (null != beginTime && null != endTime) { +// beginTimes = DateUtil.beginOfDay(DateUtil.parse(beginTime)); +// endTimes = DateUtil.endOfDay(DateUtil.parse(endTime)); +// } +// asyncService.checkSetCustomerLisByRedis(config); +// //鍒濆鍖栦綋妫�璁㈠崟琛� +// List<TjOrder> orderList = null; +// List<TjCustomer> customerList = new ArrayList<>(); +// Map<String, Object> map = new HashMap<>(); +// +// //濮撳悕鏌ヨ +// if (null != name && !"".equals(name)) { +// List<TjCustomer> list = customerService.getTjCustomerList(name); +// if (null != list && list.size() > 0) { +// List<TjCustomer> lists = new ArrayList<>(); +// for (TjCustomer customer : list) { +// if ("Y".equals(config)) { +// orderList = orderService.getCsTjOrderListByCusId1(customer.getCusId()); +// } else { +// orderList = orderService.getTjOrderListByCusId(customer.getCusId()); +// } +// if (null != orderList && orderList.size() > 0) { +// for (TjOrder tjOrder : orderList) { +// customer.setTjNumber(tjOrder.getTjNumber()); +// customer.setTjStatus(Long.valueOf(tjOrder.getCheckStatus())); +// customer.setOrderId(tjOrder.getOrderId()); +// customer.setTjTime(tjOrder.getFinishTime()); +// customer.setFinishTime(tjOrder.getFinishTime()); +// customer.setCusName(MatchUtils.hideCusName(customer.getCusName())); +// customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone())); +// customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard())); +// customer.setConfirmStatus(String.valueOf(tjOrder.getStatus())); +// customer.setTjCategory(tjOrder.getTjCategory()); +// if (tjOrder.getFirmId().equals("0")) { +// customer.setTjCompName(null); +// } else { +// customer.setTjCompName(compService.selectDictCompByDrugManufacturerId(tjOrder.getFirmId()).getCnName()); +// } +// lists.add(customer); +// } +// } +// } +// List<TjCustomer> customers = null; +// if (lists.size() > 0) { +// customers = lists.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); +// } +// map.put("customers", customers); +// map.put("total", lists.size()); +// return AjaxResult.success(map); +// } +// return AjaxResult.success("鏆傛棤鏁版嵁"); +// } +// +// //鏉′欢鏌ヨ +// if (null != tjNumber || null != compId || (null != beginTime && null != endTime)) { +// //鍒ゆ柇鏄惁寮�鍚垵瀹� +// if ("Y".equals(config)) { +// orderList = orderService.getCsTjOrderList1(tjNumber, checkStatus, compId, beginTimes, endTimes); +// } else { +// orderList = orderService.getTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes); +// } +// return getResult(page, pageSize, orderList, customerList, map); +// } +// +// List<TjCustomer> customers = null; +// if (null != checkStatus && checkStatus == 0) { +// customers = redisCache.getCacheMapValue("check", "ws"); +// } +// if (null != checkStatus && checkStatus == 1) { +// customers = redisCache.getCacheMapValue("check", "ys"); +// } +// if (customers != null && customers.size() > 0) { +//// asyncService.addRedis(customers); +// List<TjCustomer> customerLists = customers.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); +// map.put("customers", customerLists); +// map.put("total", customers.size()); +// return AjaxResult.success(map); +// } else { +// //鍒ゆ柇鏄惁寮�鍚垵瀹� +// if ("Y".equals(config)) { +// orderList = orderService.getCsTjOrderList1(tjNumber, checkStatus, compId, beginTimes, endTimes); +// } else { +// orderList = orderService.getTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes); +// } +// return getResult(page, pageSize, orderList, customerList, map); +// } + String value = String.valueOf(compId); + if (tjNumber == null) tjNumber = ""; + if (compId == null) value = ""; + if (name == null) name = ""; + if (beginTime == null) beginTime = ""; + if (endTime == null) endTime = ""; + return AjaxResult.success(orderService.getCunChuGuoChengCustomerList(tjNumber, page, pageSize, checkStatus, value, beginTime, endTime, name)); } /** @@ -412,7 +502,9 @@ if (customerService.updateById(customer)) { LambdaQueryWrapper<TbTransition> wqq = new LambdaQueryWrapper<>(); wqq.eq(TbTransition::getCusId, customer.getCusIdcard()); + wqq.eq(TbTransition::getCardId, customer.getCardId()); transitionService.remove(wqq); + asyncService.updateCheckType(tjNumber); return AjaxResult.success("鎿嶄綔鎴愬姛"); } return AjaxResult.error("鎿嶄綔澶辫触"); @@ -434,16 +526,17 @@ */ @GetMapping("/updateCheckType") @ApiOperation(value = "鎬绘鐐瑰嚮浣撴淇℃伅璇︽儏") -// @PreAuthorize("@ss.hasPermi('check:check:updateCheckType')") public AjaxResult updateCheckType(@ApiParam(value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) { - if(redisCache.hasKey("updateCheckType"+tjNumber)) { - return redisCache.getCacheMapValue("updateCheckType" + tjNumber, tjNumber); + if (redisCache.hasKey("updateCheckType" + tjNumber)) { + List<Map<String, Object>> cacheMapValue = redisCache.getCacheMapValue("updateCheckType" + tjNumber, tjNumber); + return AjaxResult.success(cacheMapValue); } return getAjaxResult(tjNumber); } private AjaxResult getAjaxResult(String tjNumber) { - final long l = System.currentTimeMillis(); + + asyncService.updateCheckType(tjNumber); List<Map<String, Object>> list = new ArrayList<>(); TjOrder one = orderService.getOrderByTjNum(tjNumber); @@ -459,6 +552,10 @@ Map<String, Object> parent = new HashMap<>(); parent.put("checkAdvice", one.getCheckAdvice()); TjProject project = projectService.selectTjProjectByProId(remark.getProId()); + //鍒ゆ柇璇ラ」鐩槸鍚﹂渶瑕佹墦鍗版姤鍛� + if ("N".equals(project.getNeedReport())) { + continue; + } if (null != project) { parent.put("parent", project.getProName()); parent.put("parentId", project.getProId().toString()); @@ -467,7 +564,11 @@ if (null != tjOrderDetails && tjOrderDetails.size() > 0) { for (TjOrderDetail tjOrderDetail : tjOrderDetails) { final TjProject byId = projectService.selectTjProjectByProId(tjOrderDetail.getProId()); - tjOrderDetail.setProject(byId); + if (null == byId) { + detailService.removeById(tjOrderDetail.getOrderDetailId()); + } else { + tjOrderDetail.setProject(byId); + } List<TjStandard> list2 = tjStandardService.getTjStandardListByProId(String.valueOf(tjOrderDetail.getProId())); if (list2.size() == 0) { tjOrderDetail.setStandard(new TjStandard()); @@ -475,14 +576,20 @@ tjOrderDetail.setStandard(list2.get(0)); } else { final int ageType = StringUtils.getAgeType(DateUtil.ageOfNow(customer.getCusBrithday())); - TjStandard tjStandard1=tjStandardService.getListBySexAndType(customer.getCusSex(),ageType, String.valueOf(tjOrderDetail.getProId())); + TjStandard tjStandard1 = tjStandardService.getListBySexAndType(customer.getCusSex(), ageType, String.valueOf(tjOrderDetail.getProId())); tjOrderDetail.setStandard(tjStandard1); } } String summary = remark.getSummary(); if (null != summary) { - String[] split = summary.split(";"); - parent.put("parentAdvice", tjAdviceService.getAdviceStringByIds(Arrays.asList(split))); + String[] split = summary.split(";"); +// List<Long> longList = new ArrayList<>(); +// for (String str : split) { +// if(!"".equals(str)){ +// longList.add(Long.valueOf(str)); +// } +// } + parent.put("parentAdvice", tjAdviceService.getAdviceStringByIds(split)); } else { parent.put("parentAdvice", null); @@ -496,10 +603,7 @@ } else { return AjaxResult.success("璇ュ鎴锋病鏈変綋妫�椤圭洰鏁版嵁"); } -// } } - final long l1 = System.currentTimeMillis(); - System.out.println("++++++++++++++++++++++++++++++++++++++++++==============="+(l1-l)); return AjaxResult.success(list); } return AjaxResult.success("璇ュ鎴锋病鏈変綋妫�椤圭洰鏁版嵁锛�"); @@ -553,6 +657,7 @@ customer.setTjTime(tjOrder.getCreateTime()); customer.setFinishTime(tjOrder.getFinishTime()); customer.setConfirmStatus(String.valueOf(tjOrder.getStatus())); + customer.setTjCategory(tjOrder.getTjCategory()); if (tjOrder.getFirmId() == null) { customer.setTjCompName("鏃�"); } else { -- Gitblit v1.8.0