src/main/java/com/diagbot/dto/MsgApiDTO.java

@@ -1,10 +1,13 @@
 package com.diagbot.dto;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Description:
@@ -34,10 +37,41 @@ public class MsgApiDTO {
     private String isRejectedEntry = "0";
     //驳回理由
     private String rejectedReason;
+    //规则状态
+    private Integer casesEntryStatus = 0;
+    // 逻辑删除标志位
+    private String isDeleted;
+    //模块名称
+    private String modelName;
+    //模块id
+    private String modelId;
+    //模块ID
+    private Long casesId;
+    //模块分数
+    private BigDecimal casesScore;
     // 记录修改时间,如果时间是1970年则表示纪录未修改
     private Date gmtModified;
     // 记录修改人id
     private String modifier;
     // 记录修改人姓名
     private String linkman;
+    // 缺陷说明
+    private String remark;
+    // 条目id对应页面数据的key值
+    private List<Long> pageKeyList = new ArrayList<>();
+
+    @ApiModelProperty("申诉条目id")
+    private Long appealInfoId = 0L;
+
+    @ApiModelProperty("审核状态 0:待审核|1:驳回|2:通过")
+    private String exampleStatus = "0";
+
+    @ApiModelProperty(value = "操作类型")
+    private String appealOperationType = "0";
+
+    @ApiModelProperty(value = "审核人")
+    private String reviewer ="-1";
+
+    @ApiModelProperty(value = "审核时间")
+    private Date exampleDate;
 }

src/main/java/com/diagbot/dto/MsgDTO.java

@@ -1,5 +1,6 @@
 package com.diagbot.dto;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -62,4 +63,21 @@ public class MsgDTO {
     private String isDeleted;
     // 缺陷说明
     private String remark;
+    // 条目id对应页面数据的key值
+    private List<Long> pageKeyList = new ArrayList<>();
+
+    @ApiModelProperty("申诉条目id")
+    private Long appealInfoId = 0L;
+
+    @ApiModelProperty("审核状态 0:待审核|1:驳回|2:通过")
+    private String exampleStatus = "0";
+
+    @ApiModelProperty(value = "操作类型")
+    private String appealOperationType = "0";
+
+    @ApiModelProperty(value = "审核人")
+    private String reviewer ="-1";
+
+    @ApiModelProperty(value = "审核时间")
+    private Date exampleDate;
 }

src/main/java/com/diagbot/entity/MedTransferRecord.java

@@ -1,271 +0,0 @@
-package com.diagbot.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-
-/**
- * <p>
- * 转入转出记录（标记时间）
- * </p>
- *
- * @author zhoutg
- * @time: 2024-12-01
- */
-public class MedTransferRecord implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 医院ID
-     */
-    private Integer hospitalId;
-
-    /**
-     * 病历号
-     */
-    private String behospitalCode;
-
-    /**
-     * 姓名
-     */
-    private String name;
-
-    /**
-     * 性别
-     */
-    private String sex;
-
-    /**
-     * 年龄
-     */
-    private Integer age;
-
-    /**
-     * 科别
-     */
-    private String deptName;
-
-    /**
-     * 转出日期
-     */
-    private LocalDateTime transferOutDate;
-
-    /**
-     * 转入日期
-     */
-    private LocalDateTime transferInDate;
-
-    /**
-     * 转出科室
-     */
-    private String transferOutDept;
-
-    /**
-     * 转入科室
-     */
-    private String transferInDept;
-
-    /**
-     * 记录医生
-     */
-    private String recDoctor;
-
-    /**
-     * 记录时间
-     */
-    private LocalDateTime recDate;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 是否删除
-     */
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    private LocalDateTime gmtCreate;
-
-    /**
-     * 记录修改时间
-     */
-    private LocalDateTime gmtModified;
-
-    /**
-     * 创建人
-     */
-    private String creator;
-
-    /**
-     * 修改人
-     */
-    private String modifier;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-    public Integer getHospitalId() {
-        return hospitalId;
-    }
-
-    public void setHospitalId(Integer hospitalId) {
-        this.hospitalId = hospitalId;
-    }
-    public String getBehospitalCode() {
-        return behospitalCode;
-    }
-
-    public void setBehospitalCode(String behospitalCode) {
-        this.behospitalCode = behospitalCode;
-    }
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-    public String getSex() {
-        return sex;
-    }
-
-    public void setSex(String sex) {
-        this.sex = sex;
-    }
-    public Integer getAge() {
-        return age;
-    }
-
-    public void setAge(Integer age) {
-        this.age = age;
-    }
-    public String getDeptName() {
-        return deptName;
-    }
-
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
-    }
-    public LocalDateTime getTransferOutDate() {
-        return transferOutDate;
-    }
-
-    public void setTransferOutDate(LocalDateTime transferOutDate) {
-        this.transferOutDate = transferOutDate;
-    }
-    public LocalDateTime getTransferInDate() {
-        return transferInDate;
-    }
-
-    public void setTransferInDate(LocalDateTime transferInDate) {
-        this.transferInDate = transferInDate;
-    }
-    public String getTransferOutDept() {
-        return transferOutDept;
-    }
-
-    public void setTransferOutDept(String transferOutDept) {
-        this.transferOutDept = transferOutDept;
-    }
-    public String getTransferInDept() {
-        return transferInDept;
-    }
-
-    public void setTransferInDept(String transferInDept) {
-        this.transferInDept = transferInDept;
-    }
-    public String getRecDoctor() {
-        return recDoctor;
-    }
-
-    public void setRecDoctor(String recDoctor) {
-        this.recDoctor = recDoctor;
-    }
-    public LocalDateTime getRecDate() {
-        return recDate;
-    }
-
-    public void setRecDate(LocalDateTime recDate) {
-        this.recDate = recDate;
-    }
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-    public LocalDateTime getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(LocalDateTime gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-    public LocalDateTime getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(LocalDateTime gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-
-    @Override
-    public String toString() {
-        return "MedTransferRecord{" +
-            "id=" + id +
-            ", hospitalId=" + hospitalId +
-            ", behospitalCode=" + behospitalCode +
-            ", name=" + name +
-            ", sex=" + sex +
-            ", age=" + age +
-            ", deptName=" + deptName +
-            ", transferOutDate=" + transferOutDate +
-            ", transferInDate=" + transferInDate +
-            ", transferOutDept=" + transferOutDept +
-            ", transferInDept=" + transferInDept +
-            ", recDoctor=" + recDoctor +
-            ", recDate=" + recDate +
-            ", remark=" + remark +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-        "}";
-    }
-}

src/main/java/com/diagbot/facade/BasDoctorInfoFacade.java

@@ -1,13 +1,9 @@
 package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.dto.MedoupDTO;
-import com.diagbot.dto.RegionDTO;
 import com.diagbot.entity.*;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.BasDoctorInfoServiceImpl;
-import com.diagbot.service.impl.MedoupServiceImpl;
-import com.diagbot.service.impl.RegionServiceImpl;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.SysUserUtils;
 import com.diagbot.vo.data.BasDoctorInfoVO;
@@ -33,10 +29,6 @@ public class BasDoctorInfoFacade extends BasDoctorInfoServiceImpl {
     BasDeptInfoFacade basDeptInfoFacade;
     @Autowired
     BehospitalInfoFacade behospitalInfoFacade;
-    @Autowired
-    private RegionServiceImpl regionService;
-    @Autowired
-    private MedoupServiceImpl medoupService;
 
     /**
      * 获取医院医生下拉列表信息

src/main/java/com/diagbot/facade/BehospitalInfoFacade.java

@@ -134,8 +134,6 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
     @Autowired
     StrWardRecordFacade strWardRecordFacade;
     @Autowired
-    MedTransferRecordFacade medTransferRecordFacade;
-    @Autowired
     MedNurseFacade medNurseFacade;
     @Autowired
     SysHospitalSetFacade sysHospitalSetFacade;
@@ -257,9 +255,9 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                     .map(BehospitalStatusEnum::getDesc)
                     .orElse("状态未知")); // 如果 code 为 null，返回默认值
 
-            List<MsgApiDTO> msgApiDTOStatusRejectedList = Lists.newLinkedList(); //驳回
-            List<MsgApiDTO> msgApiDTOStatusUnreviewedList = Lists.newLinkedList(); //未审核
-            List<MsgApiDTO> msgApiDTOStatusAlreadyPassedList = Lists.newLinkedList(); //通过
+//            List<MsgApiDTO> msgApiDTOStatusRejectedList = Lists.newLinkedList(); //驳回
+//            List<MsgApiDTO> msgApiDTOStatusUnreviewedList = Lists.newLinkedList(); //未审核
+//            List<MsgApiDTO> msgApiDTOStatusAlreadyPassedList = Lists.newLinkedList(); //通过
             if ("3".equals(behospitalInfo.getStatus())) { //已驳回
                 List<MedRejectedInfo> medRejectedInfos = medRejectedInfoFacade.list(new QueryWrapper<MedRejectedInfo>()
                         .eq("hospital_id", hospitalId)
@@ -270,28 +268,33 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 if (ListUtil.isNotEmpty(medRejectedInfos)) {
                     msgApiDTOList.forEach(msgApiDTO -> {
                         for (MedRejectedInfo medRejectedInfo : medRejectedInfos) {
-                            MsgApiDTO msgApiDTOStatus = new MsgApiDTO();
+//                            MsgApiDTO msgApiDTOStatus = new MsgApiDTO();
                             if (msgApiDTO.getCasesEntryId().equals(medRejectedInfo.getCasesEntryId())) {
                                 msgApiDTO.setIsRejectedEntry("1"); //驳回条目
                                 msgApiDTO.setRejectedReason(medRejectedInfo.getRejectedReason());
-                                msgApiDTOStatus.setMsg(msgApiDTO.getMsg());
-                                msgApiDTOStatus.setRuleType(msgApiDTO.getRuleType());
-                                msgApiDTOStatus.setScore(msgApiDTO.getScore());
-                                msgApiDTOStatusRejectedList.add(msgApiDTOStatus);
+                                msgApiDTO.setCasesEntryStatus(3);
+//                                BeanUtil.copyProperties(msgApiDTO, msgApiDTOStatus);
+//                                msgApiDTOStatusRejectedList.add(msgApiDTOStatus);
                             }
                         }
                     });
                 }
 
             } else if ("1".equals(behospitalInfo.getStatus())) { // 未审核
-                msgApiDTOStatusUnreviewedList = BeanUtil.listCopyTo(msgApiDTOList, MsgApiDTO.class);
+                msgApiDTOList.forEach(msgApiDTO -> {
+                    msgApiDTO.setCasesEntryStatus(1); //未审核条目
+                });
+//                msgApiDTOStatusUnreviewedList = BeanUtil.listCopyTo(msgApiDTOList, MsgApiDTO.class);
             } else if ("2".equals(behospitalInfo.getStatus())) { // 已通过
-                msgApiDTOStatusAlreadyPassedList = BeanUtil.listCopyTo(msgApiDTOList, MsgApiDTO.class);
+                msgApiDTOList.forEach(msgApiDTO -> {
+                    msgApiDTO.setCasesEntryStatus(2); //已通过条目
+                });
+//                msgApiDTOStatusAlreadyPassedList = BeanUtil.listCopyTo(msgApiDTOList, MsgApiDTO.class);
             }
 
-            res.put("Rejected", msgApiDTOStatusRejectedList);
-            res.put("unreviewed", msgApiDTOStatusUnreviewedList);
-            res.put("alreadyPassed", msgApiDTOStatusAlreadyPassedList);
+//            res.put("Rejected", msgApiDTOStatusRejectedList);
+//            res.put("unreviewed", msgApiDTOStatusUnreviewedList);
+//            res.put("alreadyPassed", msgApiDTOStatusAlreadyPassedList);
 
             Map<String, List<MsgApiDTO>> newMsgMap = msgApiDTOList.stream()
                     .collect(Collectors.groupingBy(
@@ -535,21 +538,6 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         List<LocalDateTime> transferInDate = new ArrayList<>();
         Map<String, List<LocalDateTime>> transferMap = new HashMap<>();
 
-        //转入转出时间表
-        List<MedTransferRecord> medTransferRecordList = medTransferRecordFacade.list(new QueryWrapper<MedTransferRecord>()
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("hospital_id", hospitalId)
-                .eq("behospital_code", analyzeVO.getBehospitalCode())
-                .orderByDesc("id"));
-        if (ListUtil.isNotEmpty(medTransferRecordList)) {
-            medTransferRecordList.forEach(medTransferRecord -> {
-                transferOutDate.add(medTransferRecord.getTransferOutDate());
-                transferInDate.add(medTransferRecord.getTransferInDate());
-            });
-        }
-        transferMap.put("转出时间", transferOutDate);
-        transferMap.put("转入时间", transferInDate);
-
         // 转入记录
         List<StrTransferInNote> strTransferInNoteList = strTransferInNoteFacade.list(new QueryWrapper<StrTransferInNote>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
@@ -1587,23 +1575,6 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
     }
 
 
-    /**
-     * 处理定时任务入参
-     *
-     * @param param
-     * @param taskVO
-     */
-    public void dealTaskVO(String param, TaskVO taskVO) {
-        if (StringUtil.isNotBlank(param)) {
-            String[] hos = param.split(",");
-            List<Long> hosptialIdList = new ArrayList<>();
-            for (String id : hos) {
-                hosptialIdList.add(Long.parseLong(id));
-            }
-            taskVO.setHosptialIdList(hosptialIdList);
-        }
-    }
-
     /**
      * 评分
      */
@@ -1637,21 +1608,6 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         }
     }
 
-
-    // /**
-    //  * 对出院日期之前3天的未评分的病历进行评分
-    //  */
-    // public void execute2(TaskVO taskVO) {
-    //     List<BehospitalInfo> behospitalInfoList = getNoGrade(taskVO);
-    //     for (BehospitalInfo bean : behospitalInfoList) {
-    //         AnalyzeVO analyzeVO = new AnalyzeVO();
-    //         analyzeVO.setIsTask(true);
-    //         analyzeVO.setHospitalId(bean.getHospitalId());
-    //         analyzeVO.setBehospitalCode(bean.getBehospitalCode());
-    //         authServiceClient.analyze_rpc(analyzeVO);
-    //     }
-    // }
-
     /**
      * 评分api
      *

src/main/java/com/diagbot/facade/MedTransferRecordFacade.java

@@ -1,13 +0,0 @@
-package com.diagbot.facade;
-
-import com.diagbot.service.impl.MedTransferRecordServiceImpl;
-import org.springframework.stereotype.Component;
-
-/**
- * @Description:
- * @author: cy
- * @time: 2024/9/23 11:39
- */
-@Component
-public class MedTransferRecordFacade extends MedTransferRecordServiceImpl {
-}

src/main/java/com/diagbot/mapper/MedTransferRecordMapper.java

@@ -1,16 +0,0 @@
-package com.diagbot.mapper;
-
-import com.diagbot.entity.MedTransferRecord;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 转入转出记录（标记时间） Mapper 接口
- * </p>
- *
- * @author zhoutg
- * @time: 2024-12-01
- */
-public interface MedTransferRecordMapper extends BaseMapper<MedTransferRecord> {
-
-}

src/main/java/com/diagbot/service/MedTransferRecordService.java

@@ -1,16 +0,0 @@
-package com.diagbot.service;
-
-import com.diagbot.entity.MedTransferRecord;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 转入转出记录（标记时间） 服务类
- * </p>
- *
- * @author zhoutg
- * @time: 2024-12-01
- */
-public interface MedTransferRecordService extends IService<MedTransferRecord> {
-
-}

src/main/java/com/diagbot/service/impl/MedTransferRecordServiceImpl.java

@@ -1,20 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.diagbot.entity.MedTransferRecord;
-import com.diagbot.mapper.MedTransferRecordMapper;
-import com.diagbot.service.MedTransferRecordService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 转入转出记录（标记时间） 服务实现类
- * </p>
- *
- * @author zhoutg
- * @time: 2024-12-01
- */
-@Service
-public class MedTransferRecordServiceImpl extends ServiceImpl<MedTransferRecordMapper, MedTransferRecord> implements MedTransferRecordService {
-
-}

src/main/java/com/diagbot/web/MedTransferRecordController.java

@@ -1,20 +0,0 @@
-package com.diagbot.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- * 转入转出记录（标记时间） 前端控制器
- * </p>
- *
- * @author zhoutg
- * @time: 2024-12-01
- */
-@Controller
-@RequestMapping("/medTransferRecord")
-public class MedTransferRecordController {
-
-}

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -304,21 +304,21 @@
         SELECT a.*, u.linkman
         FROM
         (
-        SELECT DISTINCT c.score,c.msg,c.cases_entry_id,c.is_reject,c.id id,c.info,
+        SELECT DISTINCT b.`name` model_name, b.id model_id, c.score,c.msg,c.cases_entry_id,c.is_reject,c.id id,c.info,
         a.name standard_msg, c.opt_type, c.grade_type,
         c.gmt_create, c.gmt_modified, c.modifier,c.is_deleted,c.explain_info as explainInfo,
         a.type, a.drgs, a.rule_type
         FROM
-        `qc_cases_entry` a, med_qcresult_detail c, qc_cases_hospital d
-        where a.is_deleted = 'N' and d.is_deleted = 'N'
-        and a.id = c.cases_entry_id
+        `qc_cases_entry` a, qc_mode b, med_qcresult_detail c, qc_cases_hospital d
+        where a.is_deleted = 'N' and b.is_deleted = 'N' and d.is_deleted = 'N'
+        and a.id = c.cases_entry_id and a.mode_id = b.id
         and c.hospital_id = d.hospital_id
         and c.hospital_id = #{hospitalId}
         <if test="qcresultInfoId != null">
             AND c.qcresult_info_id = #{qcresultInfoId}
         </if>
-        and c.behospital_code = #{behospitalCode} and c.opt_type != 2
-        order by c.grade_type desc, a.order_no) a
+        and c.behospital_code = #{behospitalCode} and c.opt_type != 4
+        order by b.order_no, c.grade_type desc, a.order_no) a
         LEFT JOIN sys_user u on u.id = a.modifier and u.is_deleted = 'N'
     </select>
 
@@ -336,7 +336,7 @@
         <if test="qcresultInfoId != null">
             AND c.qcresult_info_id = #{qcresultInfoId}
         </if>
-        and c.behospital_code = #{behospitalCode} and b.id = 6 and c.opt_type not in (2,4)
+        and c.behospital_code = #{behospitalCode} and b.id = 6 and and c.opt_type != 4
         order by b.order_no, c.grade_type desc, a.order_no
     </select>
 

src/main/resources/mapper/MedTransferRecordMapper.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.MedTransferRecordMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.MedTransferRecord">
-        <id column="id" property="id" />
-        <result column="hospital_id" property="hospitalId" />
-        <result column="behospital_code" property="behospitalCode" />
-        <result column="name" property="name" />
-        <result column="sex" property="sex" />
-        <result column="age" property="age" />
-        <result column="dept_name" property="deptName" />
-        <result column="transfer_out_date" property="transferOutDate" />
-        <result column="transfer_in_date" property="transferInDate" />
-        <result column="transfer_out_dept" property="transferOutDept" />
-        <result column="transfer_in_dept" property="transferInDept" />
-        <result column="rec_doctor" property="recDoctor" />
-        <result column="rec_date" property="recDate" />
-        <result column="remark" property="remark" />
-        <result column="is_deleted" property="isDeleted" />
-        <result column="gmt_create" property="gmtCreate" />
-        <result column="gmt_modified" property="gmtModified" />
-        <result column="creator" property="creator" />
-        <result column="modifier" property="modifier" />
-    </resultMap>
-
-</mapper>