zjh 2024/05/17-1

zjh

2024-05-17 88ee7561ab60710099182514bf639e37fd6114a9

zjh 2024/05/17-1

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

New file
@@ -0,0 +1,15 @@
package com.ltkj.web.controller.system;

import com.ltkj.common.core.controller.BaseController;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@RestController
@RequestMapping("/hosp/cusBlack")
@Api(tags = "PC端 ----体检黑名单记录接口")
@Slf4j
public class TjCustomerBlackController extends BaseController {

}

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

@@ -52,6 +52,7 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import org.aspectj.weaver.ast.Var;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpRequest;
@@ -1869,5 +1870,28 @@
        return AjaxResult.success(list);
    }


    @GetMapping("/revokeTjOrderByTjNum")
    @ApiOperation(value = "根据客户体检号撤销体检记录")
    @Transactional
    public AjaxResult revokeTjOrderByTjNum(@RequestParam @ApiParam(value = "体检号") String tjNum) {

        TjOrder order = tjOrderService.getOrderByTjNum(tjNum);
        if(null !=order){
            String payByTjNum = tjOrderService.isPayByTjNum(String.valueOf(order.getOrderId()));
            if(null!=payByTjNum){
                return AjaxResult.success("该用户已收费不可撤销签到!");
            }
            tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
            tjOrderDetailService.deleteTjOrderDetailByOrderDetailId(String.valueOf(order.getOrderId()));
            remarkService.deletedOrderRemarkByTjNum(tjNum);
            tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId()));
            transitionService.deletedTbTransitionByTjNum(tjNum);
            transitionService.updateTbTransitionByTjNum(tjNum);
            return AjaxResult.success("撤销成功!!!");
        }
        return AjaxResult.success("签到记录不存在!");
    }

}


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

@@ -10,12 +10,12 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ltkj.common.core.domain.TreeSelect;
import com.ltkj.common.core.domain.entity.SysDept;
import com.ltkj.hosp.domain.TjSurveyOptions;
import com.ltkj.hosp.domain.TjSurveyQuestion;
import com.ltkj.hosp.domain.TjSurveyTempQues;
import com.ltkj.common.core.domain.entity.SysDictData;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.service.ITjSurveyQuestionService;
import com.ltkj.system.service.ISysConfigService;
import com.ltkj.system.service.ISysDeptService;
import com.ltkj.system.service.ISysDictDataService;
import com.ltkj.tduck.domain.UserFormEntity;
import com.ltkj.tduck.enums.FormSourceTypeEnum;
import com.ltkj.tduck.enums.FormStatusEnum;
@@ -30,7 +30,6 @@
import com.ltkj.common.core.controller.BaseController;
import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.common.enums.BusinessType;
import com.ltkj.hosp.domain.TjSurveyTemplate;
import com.ltkj.hosp.service.ITjSurveyTemplateService;
import com.ltkj.common.utils.poi.ExcelUtil;
import com.ltkj.common.core.page.TableDataInfo;
@@ -58,7 +57,6 @@

    @Autowired
    private ISysDeptService deptService;

    /**
     * 判断是否开启填鸭表单设计
     */
@@ -161,21 +159,6 @@

        }
        return AjaxResult.success("暂无信息");


//        List<TjSurveyQuestion> l11=new ArrayList<>();
//        TjSurveyTemplate byId1 = tjSurveyTemplateService.selectTjSurveyTemplateByMid(mid);
//        List<TjSurveyTempQues> tjSurveyTempQuesList = byId1.getTjSurveyTempQuesList();
//        if (tjSurveyTempQuesList!=null){
//            for (TjSurveyTempQues tjSurveyTempQues : tjSurveyTempQuesList) {
//                TjSurveyQuestion byId11 = tjSurveyQuestionService.selectTjSurveyQuestionByQid(tjSurveyTempQues.getQid());
//                if (byId11!=null){
//                    l11.add(byId11);
//                }
//            }
//            return AjaxResult.success(l11);
//        }
//        return AjaxResult.success("暂无信息");
    }


@@ -185,7 +168,6 @@
    @GetMapping("/getQuesByMids")
    @ApiOperation(value = "获取问卷模板信息")
    public AjaxResult getQuesByMids(@RequestParam Long mid) {


        List<TjSurveyQuestion> l1 = new ArrayList<>();
//        TjSurveyTemplate byId = tjSurveyTemplateService.selectTjSurveyTemplateByMid(mid);
@@ -215,6 +197,10 @@
    @PostMapping
    public AjaxResult add(@RequestBody TjSurveyTemplate tjSurveyTemplate) {
//        return toAjax(tjSurveyTemplateService.insertTjSurveyTemplate(tjSurveyTemplate));
        TjSurveyTemplate byId = tjSurveyTemplateService.selectTemplateByTjCategory(tjSurveyTemplate.getTempType());
        if(null !=byId){
            return AjaxResult.error("该类型模板已存在  不可重复创建!!!");
        }
        final String call = configService.selectConfigByKey("need_design");
        //判断是否开启填鸭表单设计
        if ("true".equals(call)){
@@ -289,12 +275,63 @@


    /**
     * 查询问卷模板列表
     */
    @GetMapping("/listByDeptId1")
    public AjaxResult listByDeptId1() {
        SysDictData data=new SysDictData();
        data.setDictType("question_template_type");
        data.setStatus("0");
        List<TreeTjSurveryTemplate> list = tjSurveyTemplateService.selectDictDataList(data);
        if(null !=list && list.size()>0){
            for (TreeTjSurveryTemplate dictData : list) {
                List<TreeTjSurveryTemplate> templateList = tjSurveyTemplateService.getTreeTjSurveryTemplate(dictData.getVaule());
                dictData.setChildren(templateList);
            }
        }
        return AjaxResult.success(list);
    }



    @GetMapping("/getTjrWnJuanMoBan")
    public AjaxResult getTjrWnJuanMoBan(String tjCategory) {
        TjSurveyTemplate byId = tjSurveyTemplateService.selectTemplateByTjCategory(tjCategory);
//        TjSurveyTemplate byId = tjSurveyTemplateService.selectTemplateByMid1(Long.valueOf(mid));
        if(null !=byId){
            if ("1".equals(byId.getQybz())){
                return AjaxResult.success("该问卷模板不存在或已停用");
            }
            //判断是否有问题
            if(byId.getDesignId()!=null){
                return AjaxResult.success(byId.getDesignId());
            }
            LambdaQueryWrapper<TjSurveyQuestion> wq1=new LambdaQueryWrapper<>();
            wq1.eq(TjSurveyQuestion::getMid,byId.getMid());
            final List<TjSurveyQuestion> list1 = tjSurveyQuestionService.list(wq1);
            for (TjSurveyQuestion tjSurveyQuestion : list1) {
                final List<TjSurveyOptions> tjSurveyOptions = tjSurveyQuestionService.selectOptionsByQid(String.valueOf(tjSurveyQuestion.getQid()));
                tjSurveyQuestion.setTjSurveyOptionsList(tjSurveyOptions);
            }
            return AjaxResult.success(list1);

        }
        return AjaxResult.success("暂无信息");
    }



    /**
     * 修改问卷模板
     */
    //@PreAuthorize("@ss.hasPermi('hosp:surveyTemplate:edit')")
    @Log(title = "问卷模板", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody TjSurveyTemplate tjSurveyTemplate) {
        TjSurveyTemplate byId = tjSurveyTemplateService.selectTemplateByTjCategory(tjSurveyTemplate.getTempType());
        if(null !=byId){
            return AjaxResult.error("该类型模板已存在  不可重复创建!!!");
        }
        return toAjax(tjSurveyTemplateService.updateTjSurveyTemplate(tjSurveyTemplate));
    }


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

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

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
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.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.util.Date;

@Data
@NoArgsConstructor
@AllArgsConstructor
@ApiModel(value = "体检黑名单对象")
public class TjCustomerBlack extends BaseEntity {

    @TableId(type = IdType.AUTO)
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @JsonSerialize(using = ToStringSerializer.class)
    private Long cus_id;
    private String yuanyin;
    private String days;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date expiration_time;
    @ApiModelProperty(value = "备注")
    private String remark;
}

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

@@ -72,6 +72,7 @@
    @TableField(exist = false)
    private String remark;

    @TableField(exist = false)
    private Integer flag;



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

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

import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.ltkj.common.core.domain.TreeSelect;
import lombok.Data;

import java.io.Serializable;
import java.util.List;

@Data
public class TreeTjSurveryTemplate implements Serializable {
    private static final long serialVersionUID = 1L;


    @JsonSerialize(using = ToStringSerializer.class)
//    主键
    private Long id;

    /**
     * 名称
     */
    private String name;


    //值
    private String vaule;


    /**
     * 子节点
     */
    @JsonInclude(JsonInclude.Include.NON_EMPTY)
    private List<TreeTjSurveryTemplate> children;
}

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

@@ -69,6 +69,14 @@
    public boolean deletedTbTransitionByCusId(String cusId);


    @Delete("DELETE  FROM tb_transition WHERE tj_num=#{tjNum}")
    public boolean deletedTbTransitionByTjNum(String tjNum);

    @Update("UPDATE tb_transition a SET "+
            "a.tj_num=null" +
            " WHERE a.tj_num=#{tjNum}")
    boolean updateTbTransitionByTjNum(String tjNum);

    @Select("SELECT * FROM tb_transition WHERE cus_id=#{cusId} AND pac_id=#{pacId}")
    public List<TbTransition> getTbTransitionListByCusIdAndPac(@Param("cusId") String cusId,@Param("pacId") String pacId);


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

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

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

@Mapper
public interface TjCustomerBlackMapper extends BaseMapper<TjCustomerBlack> {
}

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

@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ltkj.hosp.domain.TjFlowingWater;
import com.ltkj.hosp.domain.TjOrderDetail;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -93,4 +94,9 @@
            "AND a.pay_stasus !=0 " +
            "AND a.update_time BETWEEN #{beginTime} AND #{endTime}")
    List<Long> getFlowingWaterIdList(@Param("userId") String userId,@Param("beginTime") Date beginTime,@Param("endTime") Date endTime);

    @Delete("  delete" +
            " from tj_flowing_water" +
            " where order_id = #{order}")
    public int deleteTjFlowingWaterByOrderId(String order);
}

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

@@ -55,6 +55,11 @@
     */
    public int deleteTjOrderDetailByOrderDetailId(String orderDetailId);

    @Delete("    delete\n" +
            "        from tj_order_detail\n" +
            "        where order_id = #{orderId}")
    int deleteTjOrderDetailByOrderId(String orderId);

    /**
     * 批量删除体检项目明细
     *

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

@@ -202,4 +202,8 @@

    @Select("SELECT a.card_id FROM tj_order a WHERE a.deleted=0")
    List<String> selectTjOrderByCardId1();


    @Select("SELECT a.order_id FROM tj_order_detail a WHERE a.order_id=#{orderId} AND !ISNULL(a.flowing_water_id)")
    String  isPayByTjNum(String orderId);
}

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

@@ -3,10 +3,12 @@
import java.util.List;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ltkj.hosp.domain.TjSurveyQuestion;
import com.ltkj.common.core.domain.entity.SysDictData;
import com.ltkj.hosp.domain.TjSurveyTemplate;
import com.ltkj.hosp.domain.TjSurveyTempQues;
import com.ltkj.hosp.domain.TreeTjSurveryTemplate;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;

/**
 * 问卷模板Mapper接口
@@ -93,4 +95,14 @@
         * @return 结果
         */
        public int deleteTjSurveyTempQuesByMid(Long mid);

    List<TreeTjSurveryTemplate> selectDictDataList(SysDictData dictData);


    @Select("SELECT a.mid id,a.temp_name name,a.mid vaule FROM tj_survey_template a WHERE a.temp_type=#{vaule} AND a.qybz='0'")
    List<TreeTjSurveryTemplate> getTreeTjSurveryTemplate(String vaule);


    @Select("SELECT * FROM tj_survey_template a WHERE a.temp_type=#{tjCategory} AND a.qybz='0'")
    TjSurveyTemplate selectTemplateByTjCategory(String tjCategory);
}

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

@@ -66,6 +66,10 @@
    //根据身份证号删除
    public boolean deletedTbTransitionByCusId(String cusId);

    public boolean deletedTbTransitionByTjNum(String tjNum);

    public boolean updateTbTransitionByTjNum(String tjNum);


    //根据身份证号和套餐id查询
    public List<TbTransition> getTbTransitionListByCusIdAndPac(String cusId,String pacId);

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

@@ -69,4 +69,8 @@
    String getproNameByOrderId(String orderId);

    List<Long> getFlowingWaterIdList(String userId, Date beginTime,Date endTime);



    public int deleteTjFlowingWaterByOrderId(String order);
}

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

@@ -62,6 +62,7 @@
     * @return 结果
     */
    public int deleteTjOrderDetailByOrderDetailId(String orderDetailId);
    public int deleteTjOrderDetailByOrderId(String orderId);


    /**

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

@@ -131,4 +131,6 @@
    public int selectTjOrderByCardId(String cardId);

    List<String> selectTjOrderByCardId1();

    String  isPayByTjNum(String orderId);
}

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

@@ -3,8 +3,9 @@
import java.util.List;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ltkj.hosp.domain.TjSurveyQuestion;
import com.ltkj.common.core.domain.entity.SysDictData;
import com.ltkj.hosp.domain.TjSurveyTemplate;
import com.ltkj.hosp.domain.TreeTjSurveryTemplate;

/**
 * 问卷模板Service接口
@@ -65,4 +66,11 @@
     * @return 结果
     */
    public int deleteTjSurveyTemplateByMid(Long mid);


    public List<TreeTjSurveryTemplate> selectDictDataList(SysDictData dictData);

    List<TreeTjSurveryTemplate> getTreeTjSurveryTemplate(String vaule);

    TjSurveyTemplate selectTemplateByTjCategory(String tjCategory);
}

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

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

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


public interface TjCustomerBlackService extends IService<TjCustomerBlack> {
}

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

@@ -97,6 +97,16 @@
    }

    @Override
    public boolean deletedTbTransitionByTjNum(String tjNum) {
        return tbTransitionMapper.deletedTbTransitionByTjNum(tjNum);
    }

    @Override
    public boolean updateTbTransitionByTjNum(String tjNum) {
        return tbTransitionMapper.updateTbTransitionByTjNum(tjNum);
    }

    @Override
    public List<TbTransition> getTbTransitionListByCusIdAndPac(String cusId, String pacId) {
        return tbTransitionMapper.getTbTransitionListByCusIdAndPac(cusId,pacId);
    }

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

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

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ltkj.hosp.domain.TjCustomerBlack;
import com.ltkj.hosp.mapper.TjCustomerBlackMapper;
import com.ltkj.hosp.service.TjCustomerBlackService;
import org.springframework.stereotype.Service;

@Service
public class TjCustomerBlackServiceImpl extends ServiceImpl<TjCustomerBlackMapper, TjCustomerBlack> implements TjCustomerBlackService {
}

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

@@ -113,4 +113,9 @@
    public List<Long> getFlowingWaterIdList(String userId, Date beginTime, Date endTime) {
        return tjFlowingWaterMapper.getFlowingWaterIdList(userId,beginTime,endTime);
    }

    @Override
    public int deleteTjFlowingWaterByOrderId(String order) {
        return tjFlowingWaterMapper.deleteTjFlowingWaterByOrderId(order);
    }
}

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

@@ -94,6 +94,11 @@
    }

    @Override
    public int deleteTjOrderDetailByOrderId(String orderId) {
        return tjOrderDetailMapper.deleteTjOrderDetailByOrderId(orderId);
    }

    @Override
    public List<TjProject> selectTjOrderDetailListByFlowingWaterIdIsNotNull(String orderId) {
        return tjOrderDetailMapper.selectTjOrderDetailListByFlowingWaterIdIsNotNull(orderId);
    }

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

@@ -268,4 +268,9 @@
    public List<String> selectTjOrderByCardId1() {
        return tjOrderMapper.selectTjOrderByCardId1();
    }

    @Override
    public String isPayByTjNum(String orderId) {
        return tjOrderMapper.isPayByTjNum(orderId);
    }
}

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

@@ -3,9 +3,9 @@
import java.util.List;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ltkj.common.core.domain.entity.SysDictData;
import com.ltkj.common.utils.DateUtils;
import com.ltkj.hosp.domain.TjSurveyQuestion;
import com.ltkj.hosp.mapper.TjSurveyQuestionMapper;
import com.ltkj.hosp.domain.TreeTjSurveryTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -124,6 +124,21 @@
        return tjSurveyTemplateMapper.deleteTjSurveyTemplateByMid(mid);
    }

    @Override
    public List<TreeTjSurveryTemplate> selectDictDataList(SysDictData dictData) {
        return tjSurveyTemplateMapper.selectDictDataList(dictData);
    }

    @Override
    public List<TreeTjSurveryTemplate> getTreeTjSurveryTemplate(String vaule) {
        return tjSurveyTemplateMapper.getTreeTjSurveryTemplate(vaule);
    }

    @Override
    public TjSurveyTemplate selectTemplateByTjCategory(String tjCategory) {
        return tjSurveyTemplateMapper.selectTemplateByTjCategory(tjCategory);
    }

    /**
     * 新增问卷模板问题信息
     *

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

@@ -267,5 +267,25 @@
        </foreach>
    </insert>

    <sql id="selectDictDataVo">
        select dict_code id,
               dict_label name,
               dict_value vaule
        from sys_dict_data
    </sql>

    <select id="selectDictDataList" parameterType="SysDictData" resultType="com.ltkj.hosp.domain.TreeTjSurveryTemplate">
        <include refid="selectDictDataVo"/>
        <where>
            <if test="dictType != null and dictType != ''">
                AND dict_type = #{dictType}
            </if>

            <if test="status != null and status != ''">
                AND status = #{status}
            </if>
        </where>
        order by dict_sort asc
    </select>

</mapper>