zjh202412024

zjh

2024-12-24 7b248040f67265d54fb1a386f8e36a022ee22cee

zjh202412024

 ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java

@@ -44,13 +44,10 @@
public class TjSqlController extends BaseController {
    @Resource
    private TestMapper testMapper;

    @Resource
    private TjvLtkjvtjpatService tjvLtkjvtjpatService;

    @Resource
    private LtkjMiddleDetailService middleDetailService;

    @Resource
    private LtkjMiddleHeadService headService;
    @Resource
@@ -61,16 +58,8 @@
    private LtkjHybgdService ltkjHybgdService;
    @Resource
    private LtkjHysqdService ltkjHysqdService;
    @Autowired
    public RedisTemplate<Object,Object> redisTemplate;
    @Resource
    private ITjCustomerService tjCustomerService;
    @Resource
    private RedisCache redisCache;
    @Resource
    private TjAsyncService asyncService;
    @Resource
    private ITjOrderRemarkService remarkService;
    @Resource
    private ITjOrderService orderService;
    @Resource
@@ -83,16 +72,22 @@
    private ITjOrderDetailService tjOrderDetailService;
    @Resource
    private ITjOrderRemarkService tjOrderRemarkService;
    @Resource
    private ITjProjectService projectService;


    @GetMapping("/getTjHyBgList")
    @ApiOperation(value = "查询lis数据库项目信息接口")
    public AjaxResult getTjHyBgList(@RequestParam(required = false)String pacCode,
                                    @RequestParam(required = false)String pacName,
                                    @RequestParam(required = false)String pacRemark) {
        List<Map<String, Object>> maps = testMapper.getTjHyBgList(pacCode,pacName,pacRemark);
        DynamicDataSourceContextHolder.clearDataSourceType();
        return AjaxResult.success(maps);
    public AjaxResult getTjHyBgList(@RequestParam(defaultValue = "1")Integer page,
                                    @RequestParam(defaultValue = "10")Integer pageSize,
                                    @RequestParam(required = false)String pname,
                                    @RequestParam(required = false)String pid,
                                    @RequestParam(required = false)String pym,
                                    @RequestParam(required = false)String checktype) {
//        List<Map<String, Object>> maps = testMapper.getTjHyBgList(pacCode,pacName,pacRemark);
//        DynamicDataSourceContextHolder.clearDataSourceType();
        Map<String,Object> map=  projectService.getTjHyBgList(page,pageSize,pname,pid,pym,checktype);
        return AjaxResult.success(map);
    }



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

@@ -1355,31 +1355,31 @@
            final TjCustomer byId1 = customerService.getById(order.getUserId());
            if (null != tjOrderDetailList && !tjOrderDetailList.isEmpty()) {
                //----------------------------------start
                for (TjOrderDetail tjOrderDetail : tjOrderDetailList) {
                    final TjProject byId = projectService.getById(tjOrderDetail.getProId());
                    //给病种记录表存 方便统计病种和客户信息之间的关系
                    if (tjOrderDetail.getRulesList()!=null){
                        for (TjRules tjRules : tjOrderDetail.getRulesList()) {
                            TjOrderDetailRules orderDetailRules=new TjOrderDetailRules();
                            orderDetailRules.setAid(tjRules.getAid());
                            if (byId1!=null){
                                orderDetailRules.setCusName(byId1.getCusName());
                                orderDetailRules.setCusSex(String.valueOf(byId1.getCusSex()));
                                orderDetailRules.setCusAge(String.valueOf(MatchUtils.getAgeByIdCard(byId1.getCusIdcard())));
                                orderDetailRules.setCusId(String.valueOf(byId1.getCusId()));
                            }
                            orderDetailRules.setBingzhong(tjRules.getBingzhong());
                            orderDetailRules.setDoctorName(sysUser.getNickName());
                            orderDetailRules.setTjNumber(order.getTjNumber());
                            if (byId!=null){
                                orderDetailRules.setProId(String.valueOf(byId.getProId()));
                                orderDetailRules.setProName(byId.getProName());
                            }
                            orderDetailRules.setDoctorId(String.valueOf(sysUser.getUserId()));
                            tjOrderDetailRulesService.save(orderDetailRules);
                        }
                    }
                }
//                for (TjOrderDetail tjOrderDetail : tjOrderDetailList) {
//                    final TjProject byId = projectService.getById(tjOrderDetail.getProId());
//                    //给病种记录表存 方便统计病种和客户信息之间的关系
//                    if (tjOrderDetail.getRulesList()!=null){
//                        for (TjRules tjRules : tjOrderDetail.getRulesList()) {
//                            TjOrderDetailRules orderDetailRules=new TjOrderDetailRules();
//                            orderDetailRules.setAid(tjRules.getAid());
//                            if (byId1!=null){
//                                orderDetailRules.setCusName(byId1.getCusName());
//                                orderDetailRules.setCusSex(String.valueOf(byId1.getCusSex()));
//                                orderDetailRules.setCusAge(String.valueOf(MatchUtils.getAgeByIdCard(byId1.getCusIdcard())));
//                                orderDetailRules.setCusId(String.valueOf(byId1.getCusId()));
//                            }
//                            orderDetailRules.setBingzhong(tjRules.getBingzhong());
//                            orderDetailRules.setDoctorName(sysUser.getNickName());
//                            orderDetailRules.setTjNumber(order.getTjNumber());
//                            if (byId!=null){
//                                orderDetailRules.setProId(String.valueOf(byId.getProId()));
//                                orderDetailRules.setProName(byId.getProName());
//                            }
//                            orderDetailRules.setDoctorId(String.valueOf(sysUser.getUserId()));
//                            tjOrderDetailRulesService.save(orderDetailRules);
//                        }
//                    }
//                }
                asyncService.updateOrdeltile(tjOrderDetailList, sysUser, order);
                LambdaQueryWrapper<TjOrderDetail> qww = new LambdaQueryWrapper<>();
                qww.eq(TjOrderDetail::getOrderId, order.getOrderId());
@@ -1441,6 +1441,9 @@
        String configByKey = configService.selectConfigByKey("sfkqdyhis");
        // 判断是否收费 请求接口
        TjOrder tjOrder = orderService.getOrderByTjNum(tjNumber);
        if(null ==tjOrder){
            return AjaxResult.error("未找到体检记录");
        }
        LambdaQueryWrapper<TjFlowingWater> tjFlowingWaterLambdaQueryWrapper = new LambdaQueryWrapper<>();
        tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getOrderId,tjOrder.getOrderId());
        tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getIsAddition,"N");
@@ -1524,7 +1527,7 @@
        wq2.eq(TjProject::getNeedReport,"Y");
        List<TjProject> Deptlist = projectService.list(wq2);
        List<Long> proIdList = Deptlist.stream().map(TjProject::getProId).collect(Collectors.toList());
        if (Deptlist.size() == 0 || proIdList.size() == 0) {
        if (Deptlist.isEmpty() || proIdList.isEmpty()) {
            return AjaxResult.error("该科室下无项目！");
        }
        LambdaQueryWrapper<TjOrder> wqqq = new LambdaQueryWrapper<>();

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

@@ -1,10 +1,7 @@
package com.ltkj.web.controller.system;

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;

@@ -51,6 +48,8 @@
    private ITjGroupingProService groupingProService;
    @Resource
    private ITjProjectService projectService;
    @Resource
    private TjProGzjyService proGzjyService;

    /**
     * 查询规则+病种列表
@@ -210,15 +209,49 @@
    @GetMapping("/AutoGetRule")
    @ApiOperation(value = "规则自动计算")
    public AjaxResult AutoGetRule(@ApiParam(value = "项目") @RequestParam String proId,
                                  @ApiParam(value = "客户") @RequestParam String cusId,
                                  @ApiParam(value = "客户") @RequestParam(required = false) String cusId,
                                  @ApiParam(value = "体检号")@RequestParam String tjNum,
                                  @ApiParam(value = "关键字") @RequestParam(required = false) String keyWord,
                                  @ApiParam(value = "结果值") @RequestParam(required = false) BigDecimal keyNum) {
                                  @ApiParam(value = "结果值") @RequestParam(required = false) String keyNum) {

        TjProject project = projectService.getById(proId);
        TjOrder order = orderService.getOrderByTjNum(tjNum);
        if(null !=project && null !=order){
        TjProject pproject = projectService.getById(project.getProParentId());
        List<Map<String, Object>> tjproGzJy = projectService.getTjproGzJy(tjNum, proId, keyNum, 0);
        if(null !=tjproGzJy && !tjproGzJy.isEmpty()){
//            proGzjyService.remove(new LambdaQueryWrapper<TjProGzjy>().eq(TjProGzjy::getProId,proId).eq(TjProGzjy::getTjNumber,tjNum));
            proGzjyService.deletedByTjNumAndProId(proId,tjNum);
            for (Map<String, Object> map : tjproGzJy) {
                Object bz = map.get("bz");
                Object bt = map.get("bt");
                Object nr = map.get("nr");
                TjProGzjy proGzjy=new TjProGzjy();
                proGzjy.setTjNumber(tjNum);
                proGzjy.setOrderId(order.getOrderId());
                proGzjy.setProId(Long.valueOf(proId));
                proGzjy.setProName(project.getProName());
                proGzjy.setProPrentId(project.getProParentId());
                proGzjy.setProPrentName(pproject.getProName());
                proGzjy.setProJgz(keyNum);
                if(null !=bz)proGzjy.setBz(bz.toString());
                if(null !=bt)proGzjy.setBt(bt.toString());
                if(null !=nr)proGzjy.setJy(nr.toString());
                proGzjyService.save(proGzjy);
            }
        }
        return AjaxResult.success(tjproGzJy);
        }
        return AjaxResult.success();
    }

    //之前规则算法方法
    private AjaxResult getAjaxResult(String proId, String cusId, String keyWord, BigDecimal keyNum) {
        List<TjRules> res = new ArrayList<>();
        if (proId==null){
        if (proId ==null){
            return AjaxResult.success(res);
        }
        if (cusId==null){
        if (cusId ==null){
            return AjaxResult.success(res);
        }
        TjCustomer byId = customerService.getById(cusId);
@@ -248,7 +281,7 @@
                    }
                }
            } else if ("1".equals(tjRules.getRuleType())) {
                if (keyWord!=null){
                if (keyWord !=null){
                    if (tjRules.getRuleStr().contains(keyWord)) {
                        res.add(tjRules);
                    }

 ltkj-admin/src/main/resources/banner.txt

@@ -1,16 +1,19 @@
${AnsiColor.BRIGHT_YELLOW}

                 __            /^\
               .'  \          / :.\
              /     \         | :: \
             /   /.  \       / ::: |
            |    |::. \     / :::'/
            |   / \::. |   / :::'/
            `--`   \'  `~~~ ':'/`
                    /         (
                   /   0 _ 0   \
                 \/     \_/     \/
               -== '.'   |   '.' ==-
                 /\    '-^-'    /\
                   \   _   _   /
                  .-`-((\o/))-`-.                    |
                         xxxxxx       xxxx
                           xxx        xxxx
                            x         xxxx
                 xxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxx             x
                      xxxx    xxxx    xxxx                      x
               xxx    xxx     xxxxxxxxxxxxxxx         x
                        xx    xx                 xxxx      x
    x      xxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxx     x
        x             xxxxxxxxxxxx    xxxx                 x
          x           xxxx    xxxx    xxxxxxxxxxxxx          x
           x          xxxxxxxxxxxx    xxxx                x
          x           xxxx    xxxx    xxxxxxxxxxxxx                x
       x              xxxxxxxxxxxx    xxxx                           xx
     xx               xxxx    xxxx    xxxxxxxxxxxxx                  xxx
    xxx              xxxx  x  xxxx    xxxx                         xxxxx
     xxxx          xxxx     xxxxx      xxxx                     xxxxxx
       xxxxxxxxxxxxx         xxx         xxxxxxxxxxxxxxxxxxxxxxxxx

 ltkj-common/src/main/java/com/ltkj/common/core/domain/entity/SysDept.java

@@ -191,6 +191,11 @@
     * 重点科室类型编码（PT10.06.15）
     */
    private String deptFcusTypeCode;

    private String hisksid;

    private String hisksmc;

    //以上



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

New file
@@ -0,0 +1,38 @@
package com.ltkj.hosp.domain;

import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.ltkj.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * ClassName: TjProGzjy <br/>
 * Description: <br/>
 * date: 2024/12/23 10:58<br/>
 *
 * @author zjh<br />
 */

@Data
public class TjProGzjy extends BaseEntity {

    @ApiModelProperty(value = "主键id")
    @TableId
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    private String tjNumber;
    @JsonSerialize(using = ToStringSerializer.class)
    private Long orderId;
    @JsonSerialize(using = ToStringSerializer.class)
    private Long proId;
    private String proName;
    @JsonSerialize(using = ToStringSerializer.class)
    private Long proPrentId;
    private String proPrentName;
    private String proJgz;
    private String bz;
    private String bt;
    private String jy;
}

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

New file
@@ -0,0 +1,20 @@
package com.ltkj.hosp.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ltkj.hosp.domain.TjProGzjy;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

/**
 * ClassName: TjProGzjyMapper <br/>
 * Description: <br/>
 * date: 2024/12/24 08:53<br/>
 *
 * @author zjh<br />
 */
@Mapper
public interface TjProGzjyMapper extends BaseMapper<TjProGzjy> {
    @Delete("delete from tj_pro_gzjy where tj_number=#{tjNum} and pro_id=#{proId}")
    void deletedByTjNumAndProId(@Param("proId") String proId,@Param("tjNum") String tjNum);
}

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

@@ -184,4 +184,11 @@


    List<Map<String,Object>> tjCsXmjgcx(Map<String,Object> map);


    List<Map<String,Object>> getTjproGzJy(Map<String,Object> map);


    List<List<?>> getTjHyBgList(Map<String,Object> map);

}

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

@@ -135,4 +135,8 @@

    List<Map<String,Object>> tjCsXmjgcx(String tjNum, String proId);

    List<Map<String,Object>> getTjproGzJy(String tjNum, String proId,String gzz,int cgorjyjc);


    Map<String,Object> getTjHyBgList(Integer page,Integer pageSize,String pname,String pid,String pym,String checktype);
}

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

New file
@@ -0,0 +1,16 @@
package com.ltkj.hosp.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ltkj.hosp.domain.TjProGzjy;

/**
 * ClassName: TjProGzjyService <br/>
 * Description: <br/>
 * date: 2024/12/24 08:54<br/>
 *
 * @author zjh<br />
 */

public interface TjProGzjyService extends IService<TjProGzjy> {
    void deletedByTjNumAndProId(String proId, String tjNum);
}

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

New file
@@ -0,0 +1,25 @@
package com.ltkj.hosp.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ltkj.hosp.domain.TjProGzjy;
import com.ltkj.hosp.mapper.TjProGzjyMapper;
import com.ltkj.hosp.service.TjProGzjyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

/**
 * ClassName: TjProGzjyServiceImpl <br/>
 * Description: <br/>
 * date: 2024/12/24 08:54<br/>
 *
 * @author zjh<br />
 */
@Service
public class TjProGzjyServiceImpl extends ServiceImpl<TjProGzjyMapper, TjProGzjy> implements TjProGzjyService {
    @Autowired
    private TjProGzjyMapper mapper;
    @Override
    public void deletedByTjNumAndProId(String proId, String tjNum) {
        mapper.deletedByTjNumAndProId( proId,  tjNum);
    }
}

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

@@ -304,4 +304,30 @@
        return tjProjectMapper.tjCsXmjgcx(map);
    }

    @Override
    public List<Map<String, Object>> getTjproGzJy(String tjNum, String proId, String gzz, int cgorjyjc) {
        Map<String,Object> map=new HashMap<>();
        map.put("tjnum",tjNum);
        map.put("proid",proId);
        map.put("jgz",gzz);
        map.put("cgorjyjc",cgorjyjc);
        return tjProjectMapper.getTjproGzJy(map);
    }

    @Override
    public Map<String,Object> getTjHyBgList(Integer page,Integer pageSize,String pname,String pid,String pym,String checktype) {
        Map<String,Object> map=new HashMap<>();
        map.put("page",page);
        map.put("pageSize",pageSize);
        map.put("pname",pname);
        map.put("pid",pid);
        map.put("pym",pym);
        map.put("checktype",checktype);
        List<List<?>> list = tjProjectMapper.getTjHyBgList(map);
        Map<String,Object> map1=new HashMap<>();
        map1.put("list",list);
        map1.put("total",map.get("total"));
        return map1;
    }

}

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

@@ -196,4 +196,23 @@
                #{proid,mode=IN,jdbcType=VARCHAR}
              )}
    </select>
    <select id="getTjproGzJy" parameterType="java.util.Map"  statementType="CALLABLE" resultType="java.util.Map">
        {call tj_zidonghuoqujianyiguize(
                #{tjnum,mode=IN,jdbcType=VARCHAR},
                #{proid,mode=IN,jdbcType=VARCHAR},
                #{jgz,mode=IN,jdbcType=VARCHAR},
                #{cgorjyjc,mode=IN,jdbcType=INTEGER}
              )}
    </select>
    <select id="getTjHyBgList" parameterType="java.util.Map"  statementType="CALLABLE" resultType="java.util.Map">
        {call tj_dict_list(
                #{checktype,mode=IN,jdbcType=VARCHAR},
                #{page,mode=IN,jdbcType=INTEGER},
                #{pageSize,mode=IN,jdbcType=INTEGER},
                #{pname,mode=IN,jdbcType=VARCHAR},
                #{pid,mode=IN,jdbcType=VARCHAR},
                #{pym,mode=IN,jdbcType=VARCHAR},
                #{total,mode=OUT,jdbcType=INTEGER}
              )}
    </select>
</mapper>

 ltkj-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -44,6 +44,8 @@
        <result property="deptTypeCode" column="dept_type_code"/>
        <result property="deptFcusTypeCode" column="dept_fcus_type_code"/>
        <result property="modality" column="modality"/>
        <result property="hisksid" column="hisksid"/>
        <result property="hisksmc" column="hisksmc"/>
    </resultMap>

    <sql id="selectDeptVo">
@@ -81,7 +83,9 @@
               d.standard_dept_code,
               d.dept_type_code,
               d.dept_fcus_type_code,
               d.modality
               d.modality,
               d.hisksid,
               d.hisksmc
        from sys_dept d
    </sql>

@@ -203,6 +207,8 @@

        <if test="createBy != null and createBy != ''">create_by,</if>
        <if test="modality != null and modality != ''">modality,</if>
        <if test="hisksid != null and hisksid != ''">hisksid,</if>
        <if test="hisksmc != null and hisksmc != ''">hisksmc,</if>
        create_time
        )values(
        <if test="deptId != null and deptId != 0">#{deptId},</if>
@@ -240,6 +246,8 @@

        <if test="createBy != null and createBy != ''">#{createBy},</if>
        <if test="modality != null and modality != ''">#{modality},</if>
        <if test="hisksid != null and hisksid != ''">#{hisksid},</if>
        <if test="hisksmc != null and hisksmc != ''">#{hisksmc},</if>
        sysdate()
        )
    </insert>
@@ -282,6 +290,8 @@

            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
            <if test="modality != null and modality != ''">modality = #{modality},</if>
            <if test="hisksid != null and hisksid != ''">hisksid = #{hisksid},</if>
            <if test="hisksmc != null and hisksmc != ''">hisksmc = #{hisksmc},</if>
            update_time = sysdate()
        </set>
        where dept_id = #{deptId}
@@ -309,7 +319,7 @@

    <delete id="deleteDeptById" parameterType="Long">
        update sys_dept
        set deleted = '2'
        set deleted = '1'
        where dept_id = #{deptId}
    </delete>