zjh20250414

zjh

2025-04-14 ff8914dab90da51dc8d46010f4f658780d5dba0e

zjh20250414

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

@@ -608,7 +608,7 @@
            }else {
                deptname=dept.getDeptName();
            }

            String xb= tjCustomerService.getSexByTjh(order.getTjNumber());

            for (TjOrderDetail detail : tjOrderDetailList) {
                detail.setTjStatus(1L);
@@ -637,7 +637,7 @@
                        for (String s : split) {
                            s = s.replaceAll("\n", "");
//                                        Map<String,Object> maps= rulesService.getyichangxiangmujianyiguizeJianCha(s);
                            Map<String,Object> mapss= tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(deptname,s,"0");
                            Map<String,Object> mapss= tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(deptname,s,"0",xb);
                            if(null !=mapss && !mapss.isEmpty()){
                                Object bt = mapss.get("bt");
                                Object nr = mapss.get("nr");

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

@@ -1820,6 +1820,8 @@
    private List<Map<String, Object>> zongjianyishengchakanyichangxiangmu(String tjNumber) {
//        asyncService.updateCheckType(tjNumber);

      String xb= customerService.getSexByTjh(tjNumber);

        List<TjOrderRemark> remarkList = orderRemarkService.getzongjianyishengchakanyichangxiangmu(tjNumber);
        List<TjOrderDetail> tjOrderDetails = detailService.getzongjianyishengchakanyichangxiangmu(tjNumber);
        List<Map<String, Object>> list = new ArrayList<>();
@@ -1851,7 +1853,7 @@
                                    for (String s : split) {
                                        s = s.replaceAll("\n", "");
//                                        Map<String,Object> maps= rulesService.getyichangxiangmujianyiguizeJianCha(s);
                                        Map<String, Object> maps = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(remark.getKs(), s, "0");
                                        Map<String, Object> maps = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(remark.getKs(), s, "0",xb);
                                        if (null != maps && !maps.isEmpty()) {
                                            Object bt = maps.get("bt");
                                            Object nr = maps.get("nr");

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

@@ -162,4 +162,16 @@
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(tjProAdvicerulesService.deleteTjProAdvicerulesByIds(ids));
    }



    @GetMapping("/getTjProAdvicerulesKsList")
    @ApiOperation(value = "获取体检诊断建议科室列表接口")
    public AjaxResult getTjProAdvicerulesKsList() {
        List<String> tjProAdvicerulesKsList = tjProAdvicerulesService.getTjProAdvicerulesKsList();
        return AjaxResult.success(tjProAdvicerulesKsList);
    }



}

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

@@ -390,7 +390,7 @@
            jcbgd.setShysxm(xdtgmdjg.getCreateBy());
            jcbgd.setShysdm(xdtgmdjg.getCreateId());
            jcbgd.setYxzd(xdtgmdjg.getJcjl());
            jcbgd.setYxbx("未见异常");
            jcbgd.setYxbx(xdtgmdjg.getJcjl());
            jcbgd.setZdsj(DateUtil.format(date,"yyyy-MM-dd"));
            jcbgd.setJcbw("");
            jcbgd.setSqsj(DateUtil.format(date,"yyyy-MM-dd"));

 ltkj-common/src/main/java/com/ltkj/common/core/domain/TreeSelect.java

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

import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -36,6 +37,8 @@

    private String status;

    private String dj;

    /**
     * 子节点
     */
@@ -51,6 +54,7 @@
        this.label = dept.getDeptName();
        this.qf=dept.getQf();
        this.status=dept.getStatus();
        this.dj=dept.getDj();
        this.children = dept.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
    }


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

@@ -208,6 +208,10 @@
    @TableField(exist = false)
    private String qf;


    @TableField(exist = false)
    private String dj;

    /**
     * 项目检查状态 小程序用
     */

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

@@ -108,4 +108,9 @@
    List<Map<String ,Object >> getCusInfoList(String card);

    List<Map<String ,Object >> getCusInfoListByCardAndName(@Param("card") String card,@Param("name") String name);


    @Select("SELECT IF(b.cus_sex=0,'男','女') xb FROM tj_order a JOIN tj_customer b ON b.cus_id=a.user_id \n" +
            "WHERE a.tj_number=#{tjNumber}")
    String getSexByTjh(String tjNumber);
}

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

@@ -67,6 +67,12 @@


    @Select("call tj_new_advicerules(\n" +
            "                #{ks,mode=IN,jdbcType=VARCHAR},#{jg,mode=IN,jdbcType=VARCHAR},#{kslx,mode=IN,jdbcType=VARCHAR} )")
    Map<String, Object> getyichangxiangmujianyiguizeJianCha(@Param("ks") String ks,@Param("jg") String s,@Param("kslx") String kslx);
            "                #{ks,mode=IN,jdbcType=VARCHAR},#{jg,mode=IN,jdbcType=VARCHAR}," +
            "#{kslx,mode=IN,jdbcType=VARCHAR},#{xb,mode=IN,jdbcType=VARCHAR} )")
    Map<String, Object> getyichangxiangmujianyiguizeJianCha(@Param("ks") String ks,@Param("jg") String s,@Param("kslx") String kslx,@Param("xb") String xb);



    @Select("SELECT a.ks FROM tj_pro_advicerules a WHERE a.deleted=0 GROUP BY a.ks")
    List<String> getTjProAdvicerulesKsList();
}

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

@@ -75,4 +75,6 @@
    List<Map<String, Object>> vcustomerlist(String name, String sjh, String sfzh);

    List<TjCustomer> getcusList(TjCustomer tjCustomer);

    String getSexByTjh(String tjNumber);
}

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

@@ -61,5 +61,8 @@
     */
    public int deleteTjProAdvicerulesById(Long id);

    Map<String, Object> getyichangxiangmujianyiguizeJianCha(String ks, String s, String kslx);
    Map<String, Object> getyichangxiangmujianyiguizeJianCha(String ks, String s, String kslx,String xb);


    List<String> getTjProAdvicerulesKsList();
}

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

@@ -128,4 +128,9 @@
    public List<TjCustomer> getcusList(TjCustomer tjCustomer) {
        return tjCustomerMapper.getcusList(tjCustomer);
    }

    @Override
    public String getSexByTjh(String tjNumber) {
        return tjCustomerMapper.getSexByTjh(tjNumber);
    }
}

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

@@ -92,7 +92,12 @@
    }

    @Override
    public Map<String, Object> getyichangxiangmujianyiguizeJianCha(String ks, String s, String kslx) {
        return tjProAdvicerulesMapper.getyichangxiangmujianyiguizeJianCha(ks,s,kslx);
    public Map<String, Object> getyichangxiangmujianyiguizeJianCha(String ks, String s, String kslx,String xb) {
        return tjProAdvicerulesMapper.getyichangxiangmujianyiguizeJianCha(ks,s,kslx,xb);
    }

    @Override
    public List<String> getTjProAdvicerulesKsList() {
        return tjProAdvicerulesMapper.getTjProAdvicerulesKsList();
    }
}