From eabf890be5718f5e22d03e3ce2b530da0568a8d0 Mon Sep 17 00:00:00 2001 From: lige <bestlige@outlook.com> Date: 星期四, 07 十二月 2023 17:03:31 +0800 Subject: [PATCH] 总检看职业病 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 4 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjAskWorkLog.java | 2 ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 5 + ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskMedicalHistoryController.java | 160 ++++++++++++++++++++++++++++----------- ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml | 34 ++++++++ ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 2 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCustomer.java | 3 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjHarmType.java | 2 8 files changed, 161 insertions(+), 51 deletions(-) diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java index 80c770e..fba5891 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java @@ -1320,6 +1320,7 @@ customer.setTjStatus(1L); customer.setOrderId(order.getOrderId()); customer.setIsHz(order.getIsHz()); + customer.setTjCategory(order.getTjCategory()); LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>(); wq.eq(TjOrderRemark::getTjNumber, order.getTjNumber()); wq.in(TjOrderRemark::getType, 0, 3); @@ -1393,6 +1394,7 @@ customer.setTjNumber(order.getTjNumber()); customer.setOrderId(order.getOrderId()); customer.setIsHz(order.getIsHz()); + customer.setTjCategory(order.getTjCategory()); customer.setTjStatus(0L); LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>(); wq.eq(TjOrderRemark::getTjNumber, order.getTjNumber()); @@ -1441,6 +1443,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 { @@ -1481,6 +1484,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 { @@ -1582,6 +1586,7 @@ customer.setCusIdcard(hideIdCardNum(customer.getCusIdcard())); customer.setTjNumber(entry.getValue().get(0).getTjNum()); customer.setApplicationTime(entry.getValue().get(0).getApplicationTime()); + List<TjSampling> samplings = entry.getValue(); if (null != samplings && samplings.size() > 0) { List<TjSampling> projectList = new ArrayList<>(); diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java index f8286e1..bef5dce 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java @@ -193,9 +193,8 @@ customer.setTjNumber(order.getTjNumber()); customer.setOrderId(order.getOrderId()); customer.setIsHz(order.getIsHz()); - + customer.setTjCategory(order.getTjCategory()); customerLis.add(customer); - } if (customerLis.size() > 0) { List<TjCustomer> customerList = customerLis.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); @@ -261,6 +260,7 @@ customer.setTjNumber(order.getTjNumber()); customer.setOrderId(order.getOrderId()); customer.setIsHz(order.getIsHz()); + customer.setTjCategory(order.getTjCategory()); list11111.add(customer); } } diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskMedicalHistoryController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskMedicalHistoryController.java index da91fa0..d5f7705 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskMedicalHistoryController.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskMedicalHistoryController.java @@ -1,6 +1,7 @@ package com.ltkj.web.controller.system; import java.util.List; +import java.util.stream.Collectors; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; @@ -46,6 +47,12 @@ @Autowired private ITjHarmTypeLogService tjHarmTypeLogService; + @Autowired + private ITjHarmTypeService tjHarmTypeService; + + @Resource + private ITjOrderService tjOrderService; + /** * 鏌ヨ闂瘖鍒楄〃 @@ -81,21 +88,47 @@ */ @GetMapping(value = "/getInfoById") @ApiOperation(value = "鏍规嵁瀹㈡埛id鑾峰彇闂瘖璇︾粏淇℃伅") - public AjaxResult getInfoById(@RequestParam String userId) { - if (null != userId && !"".equals(userId)) { + public AjaxResult getInfoById(@RequestParam String tjNumber) { + if (null != tjNumber && !"".equals(tjNumber)) { LambdaQueryWrapper<TjAskMedicalHistory> wq = new LambdaQueryWrapper<>(); - wq.eq(TjAskMedicalHistory::getCusId, Long.valueOf(userId)); + wq.eq(TjAskMedicalHistory::getTjNum, tjNumber); TjAskMedicalHistory one = tjAskMedicalHistoryService.getOne(wq); if (one != null) { - return success(tjAskMedicalHistoryService.selectTjAskMedicalHistoryByAskId(one.getAskId())); + LambdaQueryWrapper<TjAskWorkLog> wqq = new LambdaQueryWrapper<>(); + wqq.eq(TjAskWorkLog::getTjNumber, tjNumber); + final List<TjAskWorkLog> list = tjAskWorkLogService.list(wqq); + one.setWorkLogs(list); + + for (TjAskWorkLog askWorkLog : list) { + LambdaQueryWrapper<TjHarmTypeLog> wqq1 = new LambdaQueryWrapper<>(); + wqq1.eq(TjHarmTypeLog::getWorkId, askWorkLog.getId()); + final List<TjHarmTypeLog> list1 = tjHarmTypeLogService.list(wqq1); + + List<String> skuNos = list1.stream() + .map(TjHarmTypeLog::getAid) + .collect(Collectors.toList()); + + askWorkLog.setHarmTypeLogs(skuNos); + } + + LambdaQueryWrapper<TjAskHistorys> wqq111 = new LambdaQueryWrapper<>(); + wqq111.eq(TjAskHistorys::getAskId, one.getAskId()); + final List<TjAskHistorys> list11 = historysService.list(wqq111); + one.setTjAskHistorysList(list11); + + return AjaxResult.success(one); + }else { + TjAskMedicalHistory a = new TjAskMedicalHistory(); + LambdaQueryWrapper<TjOrder> wqqq = new LambdaQueryWrapper<>(); + wqqq.eq(TjOrder::getTjNumber, tjNumber); + final TjOrder one1 = tjOrderService.getOne(wqqq); + a.setCusId(one1.getUserId()); + TjCustomer byId11 = customerService.getById(a.getCusId()); + if (byId11 != null) { + a.setCusName(MatchUtils.hideCusName(byId11.getCusName())); + } + return AjaxResult.success(a); } - TjAskMedicalHistory a = new TjAskMedicalHistory(); - a.setCusId(Long.valueOf(userId)); - TjCustomer byId = customerService.getById(a.getCusId()); - if (byId != null) { - a.setCusName(MatchUtils.hideCusName(byId.getCusName())); - } - return AjaxResult.success(a); } return AjaxResult.success(); } @@ -109,16 +142,29 @@ public AjaxResult add(@RequestBody TjAskMedicalHistory tjAskMedicalHistory) { tjAskMedicalHistoryService.insertTjAskMedicalHistory(tjAskMedicalHistory); final List<TjAskWorkLog> workLogs = tjAskMedicalHistory.getWorkLogs(); - for (TjAskWorkLog workLog : workLogs) { - final boolean save = tjAskWorkLogService.save(workLog); - if (!save){ - return AjaxResult.error(); - } - List<TjHarmTypeLog> harmTypeLogs = workLog.getHarmTypeLogs(); - for (TjHarmTypeLog harmTypeLog : harmTypeLogs) { - final boolean save1 = tjHarmTypeLogService.save(harmTypeLog); - if (!save1){ + if (workLogs != null) { + for (TjAskWorkLog workLog : workLogs) { + workLog.setCusId(tjAskMedicalHistory.getCusId()); + workLog.setCusName(tjAskMedicalHistory.getCusName()); + workLog.setTjNumber(tjAskMedicalHistory.getTjNum()); + final boolean save = tjAskWorkLogService.save(workLog); + if (!save) { return AjaxResult.error(); + } + List<String> harmTypeLogs = workLog.getHarmTypeLogs(); + if (harmTypeLogs != null) { + for (String harmTypeLog : harmTypeLogs) { + final TjHarmType byId = tjHarmTypeService.getById(harmTypeLog); + if (byId != null) { + TjHarmTypeLog log = new TjHarmTypeLog(); + log.setAid(byId.getAid()); + log.setCusId(tjAskMedicalHistory.getCusId()); + log.setCusName(tjAskMedicalHistory.getCusName()); + log.setTjNumber(tjAskMedicalHistory.getTjNum()); + log.setWorkId(workLog.getId()); + tjHarmTypeLogService.saveOrUpdate(log); + } + } } } } @@ -134,36 +180,58 @@ @PutMapping @Transactional public AjaxResult edit(@RequestBody TjAskMedicalHistory tjAskMedicalHistory) { - boolean b =false; + LambdaQueryWrapper<TjAskWorkLog> wq = new LambdaQueryWrapper<>(); + wq.eq(TjAskWorkLog::getTjNumber, tjAskMedicalHistory.getTjNum()); + tjAskWorkLogService.remove(wq); + LambdaQueryWrapper<TjHarmTypeLog> wq1 = new LambdaQueryWrapper<>(); + wq1.eq(TjHarmTypeLog::getTjNumber, tjAskMedicalHistory.getTjNum()); + tjHarmTypeLogService.remove(wq1); + + + boolean b = false; tjAskMedicalHistory.setFromBy("PC绔�"); - if (tjAskMedicalHistory.getAskId()!=null){ + if (tjAskMedicalHistory.getAskId() != null) { b = tjAskMedicalHistoryService.updateById(tjAskMedicalHistory); - }else { + } else { b = tjAskMedicalHistoryService.save(tjAskMedicalHistory); } //boolean b = tjAskMedicalHistoryService.saveOrUpdate(tjAskMedicalHistory); - if (b){ + if (b) { List<TjAskHistorys> tjAskHistorysList = tjAskMedicalHistory.getTjAskHistorysList(); - if (tjAskHistorysList!=null&&tjAskHistorysList.size()>0){ + if (tjAskHistorysList != null && tjAskHistorysList.size() > 0) { for (TjAskHistorys tjAskHistorys : tjAskMedicalHistory.getTjAskHistorysList()) { tjAskHistorys.setAskId(tjAskMedicalHistory.getAskId()); boolean b1 = historysService.saveOrUpdate(tjAskHistorys); - if (!b1){ + if (!b1) { return AjaxResult.error(); } } } List<TjAskWorkLog> askWorkLogs = tjAskMedicalHistory.getWorkLogs(); - if (askWorkLogs!=null&&askWorkLogs.size()>0){ + if (askWorkLogs != null && askWorkLogs.size() > 0) { for (TjAskWorkLog askWorkLog : askWorkLogs) { + askWorkLog.setCusId(tjAskMedicalHistory.getCusId()); + askWorkLog.setCusName(tjAskMedicalHistory.getCusName()); + askWorkLog.setTjNumber(tjAskMedicalHistory.getTjNum()); askWorkLog.setAskId(tjAskMedicalHistory.getAskId()); boolean b1 = tjAskWorkLogService.saveOrUpdate(askWorkLog); - List<TjHarmTypeLog> harmTypeLogs = askWorkLog.getHarmTypeLogs(); - for (TjHarmTypeLog harmTypeLog : harmTypeLogs) { - tjHarmTypeLogService.saveOrUpdate(harmTypeLog); + List<String> harmTypeLogs = askWorkLog.getHarmTypeLogs(); + if (harmTypeLogs != null) { + for (String harmTypeLog : harmTypeLogs) { + final TjHarmType byId = tjHarmTypeService.getById(harmTypeLog); + if (byId != null) { + TjHarmTypeLog log = new TjHarmTypeLog(); + log.setAid(byId.getAid()); + log.setCusId(tjAskMedicalHistory.getCusId()); + log.setCusName(tjAskMedicalHistory.getCusName()); + log.setTjNumber(tjAskMedicalHistory.getTjNum()); + log.setWorkId(askWorkLog.getId()); + tjHarmTypeLogService.saveOrUpdate(log); + } + } } - if (!b1){ + if (!b1) { return AjaxResult.error(); } } @@ -181,21 +249,21 @@ @GetMapping(value = "/appGetInfoById") @ApiOperation(value = "灏忕▼搴忔牴鎹鎴疯韩浠借瘉鍙疯幏鍙栭棶璇婅缁嗕俊鎭�") public AjaxResult appGetInfoById(@RequestParam("cusIdCard") String cusIdCard) { - LambdaQueryWrapper<TjCustomer> wqqq=new LambdaQueryWrapper<>(); - wqqq.eq(TjCustomer::getCusIdcard,cusIdCard); + LambdaQueryWrapper<TjCustomer> wqqq = new LambdaQueryWrapper<>(); + wqqq.eq(TjCustomer::getCusIdcard, cusIdCard); TjCustomer one1 = tjCustomerService.getOne(wqqq); - if (one1!=null){ - LambdaQueryWrapper<TjAskMedicalHistory> wq=new LambdaQueryWrapper<>(); - wq.eq(TjAskMedicalHistory::getCusId,one1.getCusId()); + if (one1 != null) { + LambdaQueryWrapper<TjAskMedicalHistory> wq = new LambdaQueryWrapper<>(); + wq.eq(TjAskMedicalHistory::getCusId, one1.getCusId()); TjAskMedicalHistory one = tjAskMedicalHistoryService.getOne(wq); - if (one!=null){ + if (one != null) { return success(tjAskMedicalHistoryService.selectTjAskMedicalHistoryByAskId(one.getAskId())); - }else { - TjAskMedicalHistory a=new TjAskMedicalHistory(); + } else { + TjAskMedicalHistory a = new TjAskMedicalHistory(); a.setCusId(Long.valueOf(one1.getCusId())); TjCustomer byId = customerService.getById(a.getCusId()); - if (byId!=null){ + if (byId != null) { a.setCusName(byId.getCusName()); } @@ -212,20 +280,20 @@ @ApiOperation(value = "灏忕▼搴忎慨鏀归棶璇�") @PostMapping("/appEdit") public AjaxResult appEdit(@RequestBody TjAskMedicalHistory tjAskMedicalHistory) { - boolean b =false; + boolean b = false; tjAskMedicalHistory.setFromBy("灏忕▼搴忕"); - if (tjAskMedicalHistory.getAskId()!=null){ + if (tjAskMedicalHistory.getAskId() != null) { b = tjAskMedicalHistoryService.updateById(tjAskMedicalHistory); - }else { + } else { b = tjAskMedicalHistoryService.save(tjAskMedicalHistory); } - if (b){ + if (b) { List<TjAskHistorys> tjAskHistorysList = tjAskMedicalHistory.getTjAskHistorysList(); - if (tjAskHistorysList!=null&&tjAskHistorysList.size()>0){ + if (tjAskHistorysList != null && tjAskHistorysList.size() > 0) { for (TjAskHistorys tjAskHistorys : tjAskMedicalHistory.getTjAskHistorysList()) { tjAskHistorys.setAskId(tjAskMedicalHistory.getAskId()); boolean b1 = historysService.saveOrUpdate(tjAskHistorys); - if (!b1){ + if (!b1) { return AjaxResult.error(); } } 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 24eb716..c9b6c3f 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 @@ -320,6 +320,7 @@ 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 { @@ -564,6 +565,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 { diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjAskWorkLog.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjAskWorkLog.java index aa00659..de18073 100644 --- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjAskWorkLog.java +++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjAskWorkLog.java @@ -105,6 +105,6 @@ */ @ApiModelProperty(value = "鏈夊鍥犵礌") @TableField(exist = false) - private List<TjHarmTypeLog> harmTypeLogs; + private List<String> harmTypeLogs; } diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCustomer.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCustomer.java index ac9c78e..2e75a14 100644 --- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCustomer.java +++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCustomer.java @@ -301,6 +301,9 @@ @TableField(exist = false) private Long isPositive; + @TableField(exist = false) + private String tjCategory; + @Override public String toString() { diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjHarmType.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjHarmType.java index df64ef9..5851ab7 100644 --- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjHarmType.java +++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjHarmType.java @@ -21,7 +21,7 @@ @ApiModel(value = "闂瘖鑱屼笟鍙茶褰曞璞�") @AllArgsConstructor @NoArgsConstructor -public class TjHarmType extends BaseEntity { +public class TjHarmType { private static final long serialVersionUID = 1L; /** diff --git a/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml b/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml index e924067..b199c18 100644 --- a/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml +++ b/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml @@ -69,7 +69,15 @@ status, confirm_doctor, confirm_time, - confirm_status + confirm_status, + group_id, + firm_dept_id, + heshou_status, + heshou_doctor, + heshou_time, + is_hz, + get_type, + tj_category from tj_order </sql> @@ -193,6 +201,14 @@ <if test="confirmDoctor != null">confirm_doctor,</if> <if test="confirmTime != null">confirm_time,</if> <if test="confirmStatus != null">confirm_status,</if> + <if test="groupId != null">group_id,</if> + <if test="firmDeptId != null">firm_dept_id,</if> + <if test="heshouStatus != null">heshou)status,</if> + <if test="heshouDoctor != null">heshou_doctor,</if> + <if test="heshouTime != null">heshou_time,</if> + <if test="isHz != null">is_hz,</if> + <if test="getType != null">get_type,</if> + <if test="tjCategory != null">tj_category,</if> </trim> <trim prefix="values (" suffix=")" suffixOverrides=","> <if test="userId != null">#{userId},</if> @@ -225,6 +241,14 @@ <if test="confirmDoctor != null">#{confirmDoctor},</if> <if test="confirmTime != null">#{confirmTime},</if> <if test="confirmStatus != null">#{confirmStatus},</if> + <if test="groupId != null">#{groupId},</if> + <if test="firmDeptId != null">#{firmDeptId},</if> + <if test="heshouStatus != null">#{heshouStatus},</if> + <if test="heshouDoctor != null">#{heshouDoctor},</if> + <if test="heshouTime != null">#{heshouTime},</if> + <if test="isHz != null">#{isHz},</if> + <if test="getType != null">#{getType},</if> + <if test="tjCategory != null">#{tjCategory},</if> </trim> </insert> @@ -262,6 +286,14 @@ <if test="confirmDoctor != null">confirm_doctor = #{confirmDoctor},</if> <if test="confirmTime != null">confirm_time = #{confirmTime},</if> <if test="confirmStatus != null">confirm_status = #{confirmStatus},</if> + <if test="groupId != null">group_id = #{groupId},</if> + <if test="firmDeptId != null">firm_dept_id = #{firmDeptId},</if> + <if test="heshouStatus != null">heshou_status = #{heshouStatus},</if> + <if test="heshouDoctor != null">heshou_doctor = #{heshouDoctor},</if> + <if test="heshouTime != null">heshou_time = #{heshouTime},</if> + <if test="isHz != null">is_hz = #{isHz},</if> + <if test="getType != null">get_type = #{getType},</if> + <if test="tjCategory != null">tj_category = #{tjCategory},</if> </trim> where order_id = #{orderId} </update> -- Gitblit v1.8.0