zjh20250530

zjh

2025-05-30 b7d7d80a8a9e9ac145a05b5e1d545b6b61fc0cc4

zjh20250530

 ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java

@@ -2245,6 +2245,93 @@
        return AjaxResult.success();
    }


    public AjaxResult tijianBlshenqing(TjCustomer customer,TjOrder tjOrder, SysUser sysUser,String jxbz) {
        List<TbTransition> detailList = tbTransitionService.getBlTbTransitionListByCusId(customer.getCusIdcard(), tjOrder.getCardId(),jxbz);
        pacsApiMethodService.save(tjOrder, customer, detailList);
        List<TjOrderDetail> detailList1 = tjOrderDetailService.getCaiYangDengJiJxbz(tjOrder.getOrderId(), jxbz);
        tjSysAsyncService.addCaiYangDengJi(detailList1, !detailList1.isEmpty(), tjOrder, sysUser,null);

        String mergeRequest = configService.selectConfigByKey("use_lis_pacs_is_auto_merge_request");
        String lis_tmh_prefix = configService.selectConfigByKey("make_lis_tmh_prefix");
        String isRequestLisAllzx = configService.selectConfigByKey("jcx_is_requestLisAllzx");
        if (mergeRequest.equals("Y")){
            if (isRequestLisAllzx != null && isRequestLisAllzx.equals("Y")){
                log.info("进入团体根据小项标本合并发送方法");
                LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
                wrapper.eq(TjSampling::getTjNum,tjOrder.getTjNumber());
                wrapper.eq(TjSampling::getJxbz,jxbz);
                List<TjSampling> list = tjSamplingService.list(wrapper);
                List<String> strings = list.stream().map(TjSampling::getProId).collect(Collectors.toList());
                LambdaQueryWrapper<TjProject> wrapper1 = new LambdaQueryWrapper<>();
                wrapper1.in(TjProject::getProParentId,strings);
                wrapper1.eq(TjProject::getProStatus,0);
                wrapper1.eq(TjProject::getDeleted,0);
                wrapper1.groupBy(TjProject::getProId);
                List<TjProject> tjProjectList = projectService.list(wrapper1);
                Map<String, List<TjProject>> listMap = tjProjectList.stream().collect(Collectors.groupingBy(TjProject::getSpecimenType));
                log.info("分组后 ->{}",JSONUtil.toJsonStr(listMap));
                boolean save = lisApiMethod.save(listMap, tjOrder, customer);
                if (!save) {
                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                    return AjaxResult.error("处理失败");
                }
                for (TjSampling tjSampling : list) {
                    tjSampling.setIsSignFor("0");
                }
                tjSamplingService.updateBatchById(list);
            }else{
                try {
                    LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
                    wrapper.eq(TjSampling::getTjNum,tjOrder.getTjNumber());
                    wrapper.eq(TjSampling::getJxbz,jxbz);
                    List<TjSampling> list = tjSamplingService.list(wrapper);
                    log.info("采样数据 ->{}",JSONUtil.toJsonStr(list));
                    if (!list.isEmpty()) {
                        Map<String, List<TjSampling>> listMap = list.stream().collect(Collectors.groupingBy(TjSampling::getSpecimenTypeCode));
                        log.info("分组后 ->{}",JSONUtil.toJsonStr(listMap));
                        ArrayList<String> ids = new ArrayList<>();
                        for (Map.Entry<String, List<TjSampling>> entry : listMap.entrySet()) {
                            log.info("key ->{},val ->{}",entry.getKey(),entry.getValue());
                            // Lis标本代码
                            String specimenTypeCode = entry.getKey();
                            List<TjSampling> samplings = entry.getValue();
                            if (samplings.size() >= 2) {
                                // 进行合并
                                List<String> stringList = samplings.stream().map(TjSampling::getId).collect(Collectors.toList());
                                //                        log.info("提取id ->{}",stringList);
                                for (int i = 0; i < stringList.size(); i++) {
                                    String s = stringList.get(i);
                                    if (tjSamplingService.isMergeItem(s) != 0) {
                                        stringList.remove(s);
                                        ids.add(s);
                                    }
                                }
                                if (stringList.size() > 1) {
                                    String id = tjSamplingService.mergeCaiYangApi(stringList,lis_tmh_prefix);
                                    ids.add(id);
                                }else {
                                    ids.add(stringList.get(0));
                                }
                            } else {
                                ids.add(samplings.get(0).getId());
                            }
                        }
                        Boolean confirmed = samplingService.confirmSamplingApi(ids, "Y", "N");
                        if (!confirmed) {
                            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                            return AjaxResult.error("处理失败");
                        }
                    }
                } catch (NoTransactionException e) {
                    log.error(String.valueOf(e),e.getMessage());
                }
            }

        }
        return AjaxResult.success();
    }

    //退费后取消接诊作废申请单等操作
    @Transactional
    public boolean ZfHisApiMethods(TjCustomer customer, TjOrder order,Boolean isUseLisAndPacsRegister) {

 ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java

@@ -180,7 +180,6 @@
    private TjOrderRemarkMapper remarkMapper;



    @Override
    public void newSaveextracted(TjOrder tjOrder, TjCustomer tjCustomer, BigDecimal discount, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
        long l = System.currentTimeMillis();
@@ -942,15 +941,14 @@

            // TODO 和签到登记一样 只有配置中的以及收费类型为体检票时才增加到采样管理表
            if(config.equalsIgnoreCase("Y")){
//                if (lisApiMethod.isUseLisAndPacsRegister(order) && tjFlowingWater.getPayType() == 6L) {
                    List<TjOrderDetail> detailLists = tjOrderDetailService.getCaiYangDengJiJxbz(order.getOrderId(), jxbz);
                    addCaiYangDengJi(detailLists, !detailLists.isEmpty(), order, sysUser, jxbz);
//                }
                String isUseMx = configService.selectConfigByKey("jcxhis_is_use_mx");
                AjaxResult result;
                if (isUseMx.equalsIgnoreCase("Y"))
                    result = tijianbulushenqing(customer, date, order.getCardId(), jxbz, jianChaProjects, tjFlowingWater.getPayType() == 6L);
                else result = tijianbulushenqingJinchuanNew (customer, date, order.getCardId(), jxbz, jianChaProjects, tjFlowingWater.getPayType() == 6L);
                    result = tijianbulushenqing(customer, date, order.getCardId(), jxbz, jianChaProjects, (tjFlowingWater.getPayType() == 6L || tjFlowingWater.getPayStasus() == 1L));
                else
                    result = tijianbulushenqingJinchuanNew(customer, date, order.getCardId(), jxbz, jianChaProjects,(tjFlowingWater.getPayType() == 6L || tjFlowingWater.getPayStasus() == 1L));
                return result.get("code").toString().equals("200");
            }else {
                List<TjOrderDetail> detailLists = tjOrderDetailService.getCaiYangDengJiJxbz(order.getOrderId(), jxbz);
@@ -1049,14 +1047,19 @@
    }

    private static List<String> mapJinchuan=null;

    private static ArrayList<String> ids = null;

    public AjaxResult tijianbulushenqingJinchuanNew(TjCustomer customer, String date,String cardId,String jxbz,ArrayList<TjProject> jianChaProjects,Boolean isTuanTiPiao) {
        mapJinchuan=new ArrayList<>();
        ids = new ArrayList<>();
        tijianbulushenqingOld( customer,date, cardId, jxbz, jianChaProjects, isTuanTiPiao);

        tijianbulushenqingJinchuan( customer,date, cardId, jxbz, jianChaProjects, isTuanTiPiao);
        return AjaxResult.success();
        //return AjaxResult.success();
    }

    public AjaxResult tijianbulushenqingJinchuan(TjCustomer customer, String date,String cardId,String jxbz,ArrayList<TjProject> jianChaProjects,Boolean isTuanTiPiao) {
        TjOrder order = orderService.getOrderByCardId(cardId);
        if(null !=order){
@@ -1078,7 +1081,7 @@
                if (!list.isEmpty()){
                    Map<String, List<TjSampling>> listMap = list.stream().collect(Collectors.groupingBy(TjSampling::getSpecimenTypeCode));
                    log.info("分组后 ->{}",JSONUtil.toJsonStr(listMap));
                    ArrayList<String> ids = new ArrayList<>();
//                    ArrayList<String> ids = new ArrayList<>();
                    for (Map.Entry<String, List<TjSampling>> entry : listMap.entrySet()) {
                        log.info("key ->{},val ->{}",entry.getKey(),entry.getValue());
                        // Lis标本代码
@@ -1105,7 +1108,8 @@
                            ids.add(samplings.get(0).getId());
                        }
                    }
                    Boolean confirmed = samplingServiceApi.confirmSamplingApi(ids, "Y", "N");

                    Boolean confirmed = samplingServiceApi.confirmSamplingApi(ids.stream().distinct().collect(Collectors.toList()), "Y", "N");
                    if (!confirmed)
                        return AjaxResult.error("处理失败");
                }
@@ -1583,9 +1587,9 @@
                            ids.add(samplings.get(0).getId());
                        }
                    }
                    Boolean confirmed = samplingServiceApi.confirmSamplingApi(ids, "Y", "N");
                    if (!confirmed)
                        return AjaxResult.error("处理失败");
//                    Boolean confirmed = samplingServiceApi.confirmSamplingApi(ids, "Y", "N");
//                    if (!confirmed)
//                        return AjaxResult.error("处理失败");
                }
            }else {
                List<TjOutpinmedicXm> outpinmedicXms = tjOutpinmedicXmService.list();
@@ -3481,7 +3485,6 @@
        List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(order.getOrderId());
        addCaiYangDengJi(detailList, detailList.size() > 0, order, sysUser,null);
    }



    //首页饼状图登记人数接口

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java

@@ -98,15 +98,16 @@
        if (loginBody.getMobile()) {
            token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getType(), loginBody.getCode(), loginBody.getUuid());
        } else {
            token = loginService.Cuslogin(loginBody.getUsername(), loginBody.getPassword(), loginBody.getType(), loginBody.getCode(), loginBody.getUuid());
            token = loginService.Cuslogin(loginBody.getUsername(),loginBody.getSfzh(), loginBody.getPassword(), loginBody.getType(), loginBody.getCode(), loginBody.getUuid());
            LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
            wq.eq(TjCustomer::getCusPhone, loginBody.getUsername());
            wq.eq(TjCustomer::getCusIdcard, loginBody.getSfzh());
            TjCustomer tjCustomer = customerService.getOne(wq);
            List<Map<String ,Object>> customer = tjCustomerMapper.getCusInfoListByCardAndName(tjCustomer.getCusIdcard(),tjCustomer.getCusName());
            ajax.put("orderList",customer);
        }
        if (null == token) {
            return success("该账号正在使用中");
            return AjaxResult.error("登录失败!");
        }
        ajax.put(Constants.TOKEN, token);
        return ajax;

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java

@@ -1589,7 +1589,12 @@
                                } catch (NumberFormatException ignored) {
                                }
                            } else {
//                                tjOrderDetail.setYcbz("");
                                if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("阴"))
                                tjOrderDetail.setYcbz("");

                                if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("阳"))
                                    tjOrderDetail.setYcbz("↑");
                                tjOrderDetail.setProResult(tjOrderDetail.getProResult());
                            }


 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java

@@ -662,4 +662,147 @@
            throw new RuntimeException(e);
        }
    }


    @GetMapping("/getProListByBblx")
    @ApiOperation(value = "查询标本对应项目或未对应标本的项目")
    public AjaxResult getProListByBblx(@ApiParam(value = "标本类型")@RequestParam(required = false) String bblx) {
        try {
            List<TjProject> projectList =tjProjectService.getProListByBblx(bblx);
            return AjaxResult.success(projectList);
        } catch (Exception e) {
            throw new RuntimeException(e);
        }
    }

    @GetMapping("/delProByBblx")
    @ApiOperation(value = "删除项目对应标本")
    @Transactional
    public AjaxResult delProByBblx(@ApiParam(value = "项目ID")@RequestParam(required = false) String proId) {
        try {
            TjProject tjProject = tjProjectService.getById(proId);
            tjProject.setSpecimenType(null);
            tjProjectService.updateById(tjProject);
            return AjaxResult.success();
        } catch (Exception e) {
            throw new RuntimeException(e);
        }
    }


    @PostMapping("/updateProByBblx")
    @ApiOperation(value = "修改所选项目的标本类型")
    @Transactional
    public AjaxResult updateProByBblx(@ApiParam(value = "项目ID集合")@RequestParam(required = false) List<String> proIds,
                                      @ApiParam(value = "标本类型")@RequestParam(required = false)String bblx) {
        try {
            if(null !=  proIds && !proIds.isEmpty()){
                for (String proId : proIds) {
                    TjProject tjProject = tjProjectService.getById(proId);
                    tjProject.setSpecimenType(bblx);
                    tjProjectService.updateById(tjProject);
                }
            }
            return AjaxResult.success();
        } catch (Exception e) {
            throw new RuntimeException(e);
        }
    }






    @GetMapping("/getProListByBwwh")
    @ApiOperation(value = "查询部位对应项目或未对应部位的项目")
    public AjaxResult getProListByBwwh(@ApiParam(value = "标本类型")@RequestParam(required = false) String bw) {
        try {
            List<TjProject> projectList =tjProjectService.getProListByBwwh(bw);
            return AjaxResult.success(projectList);
        } catch (Exception e) {
            throw new RuntimeException(e);
        }
    }

    @GetMapping("/delProByBbwwh")
    @ApiOperation(value = "删除项目对应部位")
    @Transactional
    public AjaxResult delProByBbwwh(@ApiParam(value = "项目ID")@RequestParam(required = false) String proId) {
        try {
            TjProject tjProject = tjProjectService.getById(proId);
            tjProject.setCheckBw(null);
            tjProjectService.updateById(tjProject);
            return AjaxResult.success();
        } catch (Exception e) {
            throw new RuntimeException(e);
        }
    }

    @PostMapping("/updateProByBwwh")
    @ApiOperation(value = "修改所选项目的部位")
    @Transactional
    public AjaxResult updateProByBwwh(@ApiParam(value = "项目ID集合")@RequestParam(required = false) List<String> proIds,
                                      @ApiParam(value = "标本类型")@RequestParam(required = false)String bw) {
        try {
            if(null !=  proIds && !proIds.isEmpty()){
                for (String proId : proIds) {
                    TjProject tjProject = tjProjectService.getById(proId);
                    tjProject.setCheckBw(bw);
                    tjProjectService.updateById(tjProject);
                }
            }
            return AjaxResult.success();
        } catch (Exception e) {
            throw new RuntimeException(e);
        }
    }


//    @PostMapping("/addOrupdateProByBz")
//    @ApiOperation(value = "新增或修改所选项目的对应病种信息")
//    @Transactional
//    public AjaxResult addOrupdateProByBz(@ApiParam(value = "项目ID集合")@RequestParam(required = false) List<String> proIds,
//                                         @ApiParam(value = "病种ID")@RequestParam(required = false)String bz) {
//        try {
//            if(null !=  proIds && !proIds.isEmpty()){
//                bzProService.remove(new LambdaQueryWrapper<>(TjBzPro.class).eq(TjBzPro::getBzId,bz));
//                for (String proId : proIds) {
//                    TjBzPro bzPro=new TjBzPro();
//                    bzPro.setBzId(Long.valueOf(bz));
//                    bzPro.setProId(Long.valueOf(proId));
//                    bzProService.save(bzPro);
//                }
//            }
//            return AjaxResult.success();
//        } catch (Exception e) {
//            throw new RuntimeException(e);
//        }
//    }
//
//
//    @GetMapping("/getProByBz")
//    @ApiOperation(value = "查询病种对应项目")
//    public AjaxResult getProByBz(@ApiParam(value = "病种ID")@RequestParam(required = false)String bz) {
//        try {
//            List<TjBzPro> list = bzProService.list(new LambdaQueryWrapper<>(TjBzPro.class).eq(TjBzPro::getBzId, bz));
//            return AjaxResult.success(list);
//        } catch (Exception e) {
//            throw new RuntimeException(e);
//        }
//    }
//
//
//    @DeleteMapping("/delProByBz")
//    @ApiOperation(value = "删除病种对应项目")
//    public AjaxResult delProByBz(@ApiParam(value = "病种ID")@RequestParam(required = false)String bz,
//                                 @ApiParam(value = "项目ID")@RequestParam(required = false)String proId) {
//        try {
//            bzProService.remove(new LambdaQueryWrapper<>(TjBzPro.class).eq(TjBzPro::getBzId,bz).eq(TjBzPro::getProId,proId));
//            return AjaxResult.success();
//        } catch (Exception e) {
//            throw new RuntimeException(e);
//        }
//    }

}

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java

@@ -1813,6 +1813,33 @@
        }
    }


//    @GetMapping("/previewBase64/{flag}/{TjNumber}")
//    @ApiOperation(value = "下载体检报告Base64")
    public String previewBase64( @PathVariable("TjNumber") String tjNumber) {
        try {
            TjOrder tjOrder = tjOrderService.getOrderByTjNum(tjNumber);
            TjCustomer tjCustomer = tjCustomerService.getById( tjOrder.getUserId());
            String value = configService.selectConfigByKey("path_filePath");
            String filePath = value + File.separator + tjCustomer.getCusId() + tjNumber + tjCustomer.getCusName() + "_报告.pdf";
            File f = new File(filePath);
            //            System.out.println("Base64: " + base64);
            return fileToBase64(f);
        } catch (IOException e) {
            log.error(e.toString());
            throw new RuntimeException(e);
        }
    }

    public static String fileToBase64(File file) throws IOException {
        try (FileInputStream fileInputStream = new FileInputStream(file)) {
            byte[] fileBytes = new byte[(int) file.length()];
            fileInputStream.read(fileBytes);
            return Base64.getEncoder().encodeToString(fileBytes);
        }
    }


    @GetMapping("/previewprint/{flag}/{TjNumber}/{sfdy}")
    @ApiOperation(value = "下载体检报告")
    public void previewprint(HttpServletResponse response, @PathVariable("flag") boolean flag, @PathVariable("TjNumber") String tjNumber,@PathVariable("sfdy") String sfdy) {

 ltkj-common/src/main/java/com/ltkj/common/core/domain/model/LoginBody.java

@@ -24,6 +24,9 @@
    @ApiModelProperty(value = "密码")
    private String password;

    @ApiModelProperty(value = "密码")
    private String sfzh;

    /**
     * 验证码
     */

 ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java

@@ -217,7 +217,7 @@
     * @param password 密码
     * @return 结果
     */
    public String Cuslogin(String username, String password, Boolean type,String code,String uuid) {
    public String Cuslogin(String username,String sfzh, String password, Boolean type,String code,String uuid) {

        String aSwitch = configService.selectConfigByKey("captcha_switch");
        if(null !=aSwitch && aSwitch.equalsIgnoreCase("Y")){
@@ -237,9 +237,9 @@
        }


        LoginUser loginUser = loadCusByCusname(username, password);
        LoginUser loginUser = loadCusByCusname(username,sfzh, password);
        if (loginUser == null) {
            return "用户名或密码错误";
            return null;
        }
//       限制账户不允许多终端登录
        if (!soloLogin) {
@@ -259,11 +259,12 @@
        return tokenService.createToken(loginUser);
    }

    public LoginUser loadCusByCusname(String username, String password) {
    public LoginUser loadCusByCusname(String username,String sfzh, String password) {
        LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
        wq.eq(TjCustomer::getCusPhone, username);
        wq.eq(TjCustomer::getCusIdcard, sfzh);
        List<TjCustomer> customerList = customerService.list(wq);
        if (null == customerList || customerList.size() == 0) {
        if (null == customerList || customerList.isEmpty()) {
            //throw new ServiceException("登录用户：" + username + " 不存在");
            throw new ServiceException("账号或密码错误，请检查！");
        }

 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjDwDept.java

@@ -1,6 +1,8 @@
package com.ltkj.hosp.domain;

import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.ltkj.common.annotation.Excel;
import com.ltkj.common.core.domain.BaseEntity;
@@ -51,6 +53,11 @@
    private String dwDeptName;


    @ApiModelProperty(value = "病种")
    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String bz;


    /**
     * 签约金额
     */

 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProject.java

@@ -4,6 +4,7 @@
import java.util.ArrayList;
import java.util.List;

import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -227,9 +228,11 @@
    private String isSampling;

    @ApiModelProperty(value = "标本类型")
    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String specimenType;

    @ApiModelProperty(value = "检查部位")
    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String checkBw;



 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java

@@ -199,4 +199,13 @@

    List<Map<String ,Object>> getLisViewList();


    @Select("call getProListByBblx(#{bblx,mode=IN}) ")
    List<TjProject> getProListByBblx(@Param(value ="bblx")String bblx);


    @Select("call getProListByBwwh(#{bw,mode=IN}) ")
    List<TjProject> getProListByBwwh(String bw);


}

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java

@@ -142,4 +142,8 @@

    List<Map<String, Object>> zdysqlcx(String sql);
    void zdysqlxg(String sql);

    List<TjProject> getProListByBblx(String bblx);

    List<TjProject> getProListByBwwh(String bw);
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java

@@ -347,4 +347,15 @@
        tjProjectMapper.zdysqlxg(map);
    }


    @Override
    public List<TjProject> getProListByBblx(String bblx) {
        return tjProjectMapper.getProListByBblx(bblx);
    }

    @Override
    public List<TjProject> getProListByBwwh(String bw) {
        return tjProjectMapper.getProListByBwwh(bw);
    }

}

 ltkj-hosp/src/main/resources/mapper/TjCustomerMapper.xml

@@ -307,7 +307,7 @@
  JOIN tj_customer c ON o.user_id = c.cus_id
  LEFT JOIN tj_report r ON o.tj_number = r.tj_number
WHERE
  c.cus_idcard = #{card} AND c.cus_name = #{name} AND c.deleted = 0
  c.cus_idcard = #{card} AND c.cus_name = #{name} AND c.deleted = 0 and o.heshou_status = 1
        ORDER BY
        o.create_time DESC
    </select>