Merge remote-tracking branch 'origin/master'

zjh

2025-05-19 7e73e7699d55b4b229bef4dc5d89e01aedef5a19

Merge remote-tracking branch 'origin/master'

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

@@ -1042,7 +1042,8 @@
                              @ApiParam(value = "单位") @RequestParam(required = false) Long compId,
                              @ApiParam(value = "姓名)") @RequestParam(required = false) String name,
                              @ApiParam(value = "开始时间") @RequestParam(required = false) String beginTime,
                              @ApiParam(value = "结束时间") @RequestParam(required = false) String endTime) {
                              @ApiParam(value = "结束时间") @RequestParam(required = false) String endTime,
                              @ApiParam(value = "体检类型") @RequestParam(required = false) String tjCategory) {
        //        String config = configService.selectConfigByKey("tj_confirm");
//        DateTime beginTimes = null;
//        DateTime endTimes = null;
@@ -1139,7 +1140,7 @@
        if (name == null) name = "";
        if (beginTime == null) beginTime = "";
        if (endTime == null) endTime = "";
        return AjaxResult.success(orderService.getCunChuGuoChengCustomerList(tjNumber, page, pageSize, checkStatus, value, beginTime, endTime, name));
        return AjaxResult.success(orderService.getCunChuGuoChengCustomerList(tjNumber, page, pageSize, checkStatus, value, beginTime, endTime, name,tjCategory));
    }


@@ -1266,7 +1267,9 @@
//    @PreAuthorize("@ss.hasPermi('check:check:getTjdetailList')")
    public AjaxResult getTjdetailList(@ApiParam(value = "体检tjNumber") @RequestParam String tjNumber,
                                      @ApiParam(value = "总检建议") @RequestParam(required = false) String advice,
                                      @ApiParam(value = "审核状态0待审核1已审核") @RequestParam Integer checkStatus) {
                                      @ApiParam(value = "审核状态0待审核1已审核") @RequestParam Integer checkStatus,
                                      @ApiParam(value = "职业结论") @RequestParam(required = false) String zhiyeJl,
                                      @ApiParam(value = "职业结果") @RequestParam(required = false) String zhiyeJg) {

        String config = configService.selectConfigByKey("sfjcwjhyqxm");
        if (null != config && config.equalsIgnoreCase("Y")) {
@@ -1288,6 +1291,10 @@
                tjOrder.setCheckTime(date);
                tjOrder.setStatus(401);
                tjOrder.setFinishTime(date);
                if (StrUtil.isNotBlank(zhiyeJl))
                    tjOrder.setZhiyeJl(zhiyeJl);
                if (StrUtil.isNotBlank(zhiyeJg))
                    tjOrder.setZhiyeJg(zhiyeJg);
                if (orderService.updateById(tjOrder)) {
                    TjCustomer customer = customerService.getById(tjOrder.getUserId());
                    if (null != customer) {
@@ -1537,6 +1544,8 @@
                parent.put("parentId", remark.getProsId());
                parent.put("xmlb", remark.getXmlb());
                parent.put("", remark.getXmlb());
                parent.put("zhiyejl",one.getZhiyeJl());
                parent.put("zhiyejg", one.getZhiyeJg());
                List<TjOrderDetail> dels = new ArrayList<>();
                if (null != tjOrderDetails && !tjOrderDetails.isEmpty()) {
                    for (TjOrderDetail tjOrderDetail : tjOrderDetails) {

 ltkj-admin/src/main/resources/sql/index.sql

@@ -17,3 +17,21 @@

# æŸ¥çœ‹æœ€å¤§çš„连接数
SHOW VARIABLES LIKE 'max_connections';

CREATE TABLE tj_report_special_project (
                                           id BIGINT PRIMARY KEY NOT NULL,
                                           pro_id BIGINT NOT NULL UNIQUE,
                                           template_key TINYINT(2) NOT NULL COMMENT '模板判断编号 æ ¹æ®ç¼–号走不同的生成模板类型',
                                           params TEXT NULL COMMENT '需要额外传递的参数'
) COMMENT '报告特殊项目';


-- å‡Œäº‘数据
INSERT INTO tj_report_special_project VALUES(1623853479200546816,1862852701533012001,1,'{"dy":"4.0","xy":"4.0","title":"阳性参考值：","dystr":"DOB值：         â‰¥      ${dy}                HP-阳性","xystr":"                <      ${xy}                  æ­£å¸¸","en":"DOB"}');


-- åŽ¿åŒ»é™¢æ•°æ®
INSERT INTO tj_report_special_project VALUES(1623853479200546817,1870371396991955967,1,'{"dy":"100","xy":"100","title":"参考值(DPM)：","dystr":"DPM值：         â‰¥      ${dy}                é˜³æ€§","xystr":"                <      ${xy}                  é˜´æ€§","en":"DPM"}');


SELECT * FROM tj_report_special_project;

 ltkj-admin/src/main/resources/sql/Ö°Òµ²¡.sql

@@ -20,4 +20,18 @@
ALTER TABLE tj_order ADD COLUMN zhiye_jl VARCHAR(255) NULL COMMENT '职业结论';
ALTER TABLE tj_order ADD COLUMN zhiye_jg VARCHAR(255) NULL COMMENT '职业结果';

# å­˜å‚¨è¿‡ç¨‹ä¿®æ”¹
# tj_check_list
# å¢žåŠ å‚数以及最终结果集返回增加条件
# åœ¨OUT参数前增加：
IN p_tjCategory VARCHAR(100)
# æœ€ç»ˆè¿”回条件查询
-- è®¡ç®—总行数
select count(tjNumber) into total from ls_check_list WHERE (p_tjCategory IS NULL OR tjCategory = p_tjCategory);
-- æ‰§è¡Œåˆ†é¡µæŸ¥è¯¢å¹¶è¿”回结果集
if checkStatus =0 THEN
select * from ls_check_list WHERE (p_tjCategory IS NULL OR tjCategory = p_tjCategory) ORDER BY finishTime DESC LIMIT  page,pageSize;
ELSE
select * from ls_check_list WHERE (p_tjCategory IS NULL OR tjCategory = p_tjCategory) ORDER BY shsj DESC LIMIT  page,pageSize;
END if;


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

@@ -126,7 +126,7 @@

    //存储过程专用接口(总检)
    Map<String,Object> getCunChuGuoChengCustomerList(String tjNumber,Integer page,Integer pageSize,
                                                   Integer checkStatus, String compId, String beginTime, String endTime,String tjname);
                                                   Integer checkStatus, String compId, String beginTime, String endTime,String tjname,String tjCategory);

    //存储过程专用接口(初审)
    Map<String,Object> getCsCunChuGuoChengCustomerList(String tjNumber,Integer page,Integer pageSize,

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

@@ -226,7 +226,7 @@

    @Override
    public Map<String,Object> getCunChuGuoChengCustomerList(String tjNumber, Integer page, Integer pageSize, Integer checkStatus,
                                                          String compId, String beginTime, String endTime, String tjname) {
                                                          String compId, String beginTime, String endTime, String tjname,String tjCategory) {

        Map<String, Object> map = new HashMap<>();
        map.put("checkStatus",checkStatus);
@@ -237,6 +237,7 @@
        map.put("tjname",tjname);
        map.put("beginTime",beginTime);
        map.put("endTime",endTime);
        map.put("p_tjCategory",tjCategory);
        List<List<?>> list = tjOrderMapper.getCunChuGuoChengCustomerList(map);
        Map<String,Object> map1=new HashMap<>();
        map1.put("customers",list);

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

@@ -364,6 +364,7 @@
                #{tjname,mode=IN,jdbcType=VARCHAR},
                #{beginTime,mode=IN,jdbcType=VARCHAR},
                #{endTime,mode=IN,jdbcType=VARCHAR},
                #{p_tjCategory,mode=IN,jdbcType=VARCHAR},
                #{total,mode=OUT,jdbcType=INTEGER}
            )}
    </select>