zjh 本地 2024/02/29 -1

zjh

2024-02-29 edb81cb36ef2ff4560afdbe7918a747adbad998f

zjh 本地 2024/02/29 -1

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

@@ -10,16 +10,14 @@
import com.ltkj.common.enums.DataSourceType;
import com.ltkj.framework.config.UserHoder;
import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
import com.ltkj.hosp.domain.TjCustomer;
import com.ltkj.hosp.domain.TjOrder;
import com.ltkj.hosp.domain.TjOrderRemark;
import com.ltkj.hosp.domain.TjProject;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.sqlDomain.*;
import com.ltkj.hosp.mapper.TestMapper;
import com.ltkj.system.service.ISysDeptService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.ConvertingCursor;
@@ -82,6 +80,11 @@
    private LtkjHisUserService hisUserService;
    @Resource
    private ITjProjectService tjProjectService;
    @Autowired
    private ITjOrderDetailService tjOrderDetailService;
    @Resource
    private ITjOrderRemarkService tjOrderRemarkService;


    @GetMapping("/getTjHyBgList")
    @ApiOperation(value = "查询lis数据库项目信息接口")
@@ -439,4 +442,17 @@
    }


    @GetMapping("/getHuaYanProByTjNum")
    @ApiOperation(value = "根据体检号查询化验项目接口")
    public AjaxResult getHuaYanProByTjNum(@RequestParam @ApiParam(value = "体检号") String tjNumber) {
        Map<String,Object> map=new HashMap<>();

        List<TjOrderDetail> tjOrderDetails = tjOrderDetailService.addHuaYanTable(tjNumber);
        List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.addHuaYanTable(tjNumber);
        map.put("tjOrderDetails",tjOrderDetails);
        map.put("tjOrderRemarks",tjOrderRemarks);
        return AjaxResult.success(map);
    }


}

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

@@ -1435,6 +1435,7 @@
            wqq.eq(TjOrderDetail::getOrderId, one.getOrderId());
            wqq.isNotNull(TjOrderDetail::getFlowingWaterId);
            wqq.in(TjOrderDetail::getProId, proIdList);
            wqq.notIn(TjOrderDetail::getProId, proIdList,projectService.getNneedReprotProId());
            List<TjOrderDetail> detailList = detailService.list(wqq);
            if (detailList != null && detailList.size() > 0) {
                List<Long> collect = detailList.stream().map(TjOrderDetail::getProId).collect(Collectors.toList());
@@ -1442,6 +1443,8 @@
                wq.eq("tj_number", tjNumber);
                wq.in("pro_id", collect);
                wq.ne("type", 2);
                wq.ne("dept_id",241);
                wq.notIn("pro_id", proIdList,projectService.getNneedReprotProId());
                List<TjOrderRemark> list = remarkService.list(wq);
                if (list.size() == 0) {
                    return AjaxResult.success("该科室下无项目！");

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

@@ -725,6 +725,7 @@
        wq.ne(TjOrderDetail::getTjStatus, 0);
        wq.ne(TjOrderDetail::getProId,projectService.getHuaYanProId());
        wq.eq(TjOrderDetail::getProId,projectService.getNotCcCtXdtProId());
        wq.notIn(TjOrderDetail::getProId,projectService.getNneedReprotProId());
        List<TjOrderDetail> tjOrderDetails = tjOrderDetailService.list(wq);

        //遍历体检记录 将项目的具体信息
@@ -743,6 +744,7 @@
        wqq.eq(TjOrderRemark::getTjNumber, tjNumber);
        wqq.ne(TjOrderRemark::getDeptId,"241");
        wqq.in(TjOrderRemark::getDeptId,"269","270","253","254","255","257");
        wqq.notIn(TjOrderRemark::getProId,projectService.getNneedReprotProId());
        List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.list(wqq);

        for (TjOrderRemark tjOrderRemark : tjOrderRemarks) {

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

@@ -55,6 +55,7 @@
            " <when test='pacRemark!=null'>" +
            "  AND mobile = #{pacRemark}" +
            "</when>" +
            " order by fcard_iD desc"+
            "</script>"})
    public List<Map<String,Object>> newGetTjPat(@Param("pacCode")String pacCode,
                                                @Param("pacName")String pacName,

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

@@ -114,11 +114,11 @@
            "  create_id,\n" +
            "  pro_type) \n" +
            "  \n" +
            "  SELECT #{orderId},a.pro_id,IFNULL(b.pro_default,''),'0',SYSDATE(),#{userName},b.is_sampling,#{userId},IFNULL(a.pac_id,0) FROM tb_transition a LEFT JOIN tj_project b ON a.pro_id=b.pro_id  WHERE a.cus_id=#{cusId} and b.need_report='Y' \n" +
            "  SELECT #{orderId},a.pro_id,IFNULL(b.pro_default,''),'0',SYSDATE(),#{userName},b.is_sampling,#{userId},IFNULL(a.pac_id,0) FROM tb_transition a LEFT JOIN tj_project b ON a.pro_id=b.pro_id  WHERE a.cus_id=#{cusId} \n" +
            "\t\t\n" +
            "\tUNION\n" +
            "  \n" +
            "\tSELECT #{orderId},a.parent_pro_id,IFNULL(b.pro_default,''),'0',SYSDATE(),#{userName},b.is_sampling,#{userId},IFNULL(a.pac_id,0) FROM tb_transition a LEFT JOIN tj_project b ON a.parent_pro_id=b.pro_id  WHERE a.cus_id=#{cusId} and b.need_report='Y' GROUP BY a.parent_pro_id")
            "\tSELECT #{orderId},a.parent_pro_id,IFNULL(b.pro_default,''),'0',SYSDATE(),#{userName},b.is_sampling,#{userId},IFNULL(a.pac_id,0) FROM tb_transition a LEFT JOIN tj_project b ON a.parent_pro_id=b.pro_id  WHERE a.cus_id=#{cusId}  GROUP BY a.parent_pro_id")
     boolean saveTjOrderDetailsByCusId(@Param("cusId")String cusId,@Param("orderId")String orderId,@Param("userName")String userName,@Param("userId") String userId);



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

@@ -67,7 +67,8 @@
    boolean saveTjOrderRemarkByOrderId(@Param("tjNumber")String tjNumber,@Param("userName") String userName,@Param("userId") String userId,@Param("orderId")String orderId);


    @Select("SELECT * FROM tj_order_remark WHERE tj_number=#{tjNumber} AND type =1 AND deleted='0'")
    @Select("SELECT * FROM tj_order_remark a LEFT JOIN tj_project b ON a.pro_id=b.pro_id  WHERE a.tj_number=#{tjNumber}" +
            " AND a.type =1 AND a.deleted=0 AND b.need_report='N' AND b.deleted=0")
    List<TjOrderRemark> getRemarkListByTjNumAndType(String tjNumber);



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

@@ -162,4 +162,7 @@

    @Select("SELECT a.pro_id FROM tj_project a  JOIN sys_dept b ON a.dept_id=b.dept_id WHERE a.deleted=0 AND b.dept_id in(269,270,253,254,255,257) AND a.need_report='Y'")
    List<Long> getNotCcCtXdtProId();

    @Select("SELECT a.pro_id FROM tj_project a WHERE a.deleted=0 AND  a.need_report='N'")
    List<Long> getNneedReprotProId();
}

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

@@ -122,4 +122,7 @@
    List<Long> getNotCcCtXdtProId();


    List<Long> getNneedReprotProId();


}

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

@@ -236,6 +236,11 @@
        return tjProjectMapper.getNotCcCtXdtProId();
    }

    @Override
    public List<Long> getNneedReprotProId() {
        return tjProjectMapper.getNneedReprotProId();
    }

    /**
     * 递归列表
     */