zjh20250325

zjh

2025-03-25 f5e009d6c7cdb7ec64ab68feed4456fec49187b8

zjh20250325

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

@@ -37,6 +37,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import jodd.util.StringUtil;
import lombok.extern.slf4j.Slf4j;
import lombok.var;
import org.aspectj.weaver.AjAttribute;
@@ -1746,10 +1747,14 @@

    private List<Map<String, Object>> zongjianyishengchakanyichangxiangmu(String tjNumber) {
//        asyncService.updateCheckType(tjNumber);

        List<Map<String, Object>> list = new ArrayList<>();
        TjOrder order = orderService.getOrderByTjNum(tjNumber);
        if(null !=order){
        List<TjOrderRemark> remarkList = orderRemarkService.getzongjianyishengchakanyichangxiangmu(tjNumber);
        List<TjOrderDetail> tjOrderDetails = detailService.getzongjianyishengchakanyichangxiangmu(tjNumber);
        List<Map<String, Object>> list = new ArrayList<>();
            LambdaQueryWrapper<TjOrderYcxm> wq=new LambdaQueryWrapper<>();
            wq.eq(TjOrderYcxm::getTjh,tjNumber);
            List<TjOrderYcxm> ycxmList = ycxmService.list(wq);
        if (null != remarkList && !remarkList.isEmpty()) {
            for (TjOrderRemark remark : remarkList) {
                Map<String, Object> parent = new HashMap<>();
@@ -1788,6 +1793,17 @@
                                }

                            }
                                if(null==ycxmList || ycxmList.isEmpty()){
                                    TjOrderYcxm ycxm=new TjOrderYcxm();
                                    ycxm.setTjh(tjNumber);
                                    ycxm.setParentName(remark.getProName());
                                    ycxm.setJcxm(tjOrderDetail.getProName());
                                    ycxm.setJcjg(tjOrderDetail.getProResult());
                                    ycxm.setCkfw(tjOrderDetail.getStanId());
                                    ycxm.setDw(tjOrderDetail.getProAdvice());
                                    ycxm.setJynr(JSONUtil.toJsonStr(tjOrderDetail.getAdvices()));
                                    ycxmService.save(ycxm);
                                }

                            dels.add(tjOrderDetail);
                        }
@@ -1802,6 +1818,7 @@
            }

        }
        }
        return list;
    }


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

@@ -222,6 +222,14 @@
    @ApiModelProperty("单位部门")
    private String department;


    @ExcelExport(value = "所在地",sort =-5)
    @ExcelImport("所在地")
    @Excel(name = "所在地",sort = 5,cellType = Excel.ColumnType.STRING,color = IndexedColors.RED)
    @ApiModelProperty("所在地")
    private String szd;


    /**
     * 部门编号
     */

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

@@ -73,7 +73,8 @@
               time_region,
               id_type,
               age_unit,
               career
               career,
               szd
        from tj_reservation
    </sql>

@@ -87,6 +88,7 @@
            <if test="companyId != null  and companyId != ''">and company_id = #{companyId} </if>
            <if test="reservationTime != null ">and reservation_time  BETWEEN #{reservationTime} and now()</if>
            <if test="isExpire != null ">and is_expire = #{isExpire}</if>
            <if test="szd != null ">and szd = #{szd}</if>
            and deleted = '0'
        </where>
        ORDER BY create_time desc