义乌核查分支-原来质控核查接口修改

src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -233,6 +233,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/consoleByDept/medicalCheckFormKs").permitAll()
                 .antMatchers("/print/export/medicalCheckExportByDept").permitAll()
                 .antMatchers("/consoleByDept/medicalCheckTitleKs").permitAll()
+                .antMatchers("/qc/behospitalInfo/logicDelCase").permitAll()
                 .antMatchers("/**").authenticated();
         //                .antMatchers("/**").permitAll();
     }

src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -277,6 +277,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/consoleByDept/medicalCheckFormKs", request)
                 || matchers("/print/export/medicalCheckExportByDept", request)
                 || matchers("/consoleByDept/medicalCheckTitleKs", request)
+                || matchers("/qc/behospitalInfo/logicDelCase", request)
                 || matchers("/", request)) {
             return true;
         }

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

@@ -59,7 +59,7 @@ public class MsgDTO {
     // 逻辑删除标志位
     private String isDeleted;
     // 缺陷说明
-    private String explain;
+    private String explainInfo;
     // 条目id对应页面数据的key值
     private List<Long> pageKeyList = new ArrayList<>();
 }

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

@@ -2,8 +2,10 @@ package com.diagbot.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -14,6 +16,7 @@ import java.util.Date;
  * @author wangfeng
  * @since 2020-07-06
  */
+@Data
 public class MedCheckInfo implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -79,100 +82,51 @@ public class MedCheckInfo implements Serializable {
      */
     private Integer status;
 
+    /**
+     * 核查类型（0病历，1病案首页,2全部）
+     */
     private Integer checkType;
 
-    public Integer getCheckType() {
-        return checkType;
-    }
-
-    public void setCheckType(Integer checkType) {
-        this.checkType = checkType;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-    public String getCreator() {
-        return creator;
-    }
+    /**
+     * 生成状态（0未生成，1已生成）
+     */
+    private Integer createStatus;
 
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-    public String getModifier() {
-        return modifier;
-    }
+    /**
+     * 核查任务创建人编号
+     */
+    private String jobCreator;
 
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-    public String getBehospitalCode() {
-        return behospitalCode;
-    }
+    /**
+     * 核查任务创建人
+     */
+    private String jobCreatorName;
 
-    public void setBehospitalCode(String behospitalCode) {
-        this.behospitalCode = behospitalCode;
-    }
-    public Long getHospitalId() {
-        return hospitalId;
-    }
+    /**
+     * 核查任务生成时间
+     */
+    private Date jobCreateTime;
 
-    public void setHospitalId(Long hospitalId) {
-        this.hospitalId = hospitalId;
-    }
-    public Long getCheckId() {
-        return checkId;
-    }
+    /**
+     * 核查任务类型（0-科室任务 1-院级 2-质控科）
+     */
+    private Integer jobType;
 
-    public void setCheckId(Long checkId) {
-        this.checkId = checkId;
-    }
-    public String getCheckName() {
-        return checkName;
-    }
+    /**
+     * 核查任务分配人编号
+     */
+    private String jobDistributor;
 
-    public void setCheckName(String checkName) {
-        this.checkName = checkName;
-    }
-    public Date getCheckTime() {
-        return checkTime;
-    }
+    /**
+     * 核查任务分配人姓名
+     */
+    private String jobDistributionName;
 
-    public void setCheckTime(Date checkTime) {
-        this.checkTime = checkTime;
-    }
-    public Integer getStatus() {
-        return status;
-    }
+    /**
+     * 核查任务分配时间
+     */
+    private Date jobDistributionTime;
 
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
 
     @Override
     public String toString() {

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

@@ -114,5 +114,5 @@ public class QcresultDetail implements Serializable {
     /**
      * 质控条目说明
      */
-    private String explain;
+    private String explainInfo;
 }

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

@@ -28,7 +28,7 @@ import java.util.Map;
  */
 @Component
 public class AlgorithmFacade {
-    private final static List<Integer> types = Arrays.asList(0, 1, 2, 3);
+    private final static List<Integer> types = Arrays.asList(0, 1, 2, 3,4);
 
     @Autowired
     private SysHospitalSetFacade sysHospitalSetFacade;

src/main/java/com/diagbot/vo/QcResultAlgVO.java

@@ -30,7 +30,7 @@ public class QcResultAlgVO {
     //质控返回info
     private String info;
     //质控条目说明
-    private String explain;
+    private String explainInfo;
     //单项否决（1-单项否决 0-非）
     private Integer isReject;
 }

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

@@ -147,14 +147,15 @@ public class BehospitalInfoController {
         qcresultVO.setType(2);
         return RespDTO.onSuc(qcresultInfoFacade.changeQcResult(qcresultVO));
     }
-    @ApiOperation(value = "逻辑删除质控条目[by:zhoutg]",
+
+    @ApiOperation(value = "逻辑删除质控条目[by:songxl]",
             notes = "behospitalCode：病历号，必填<br>" +
                     "id：明细id，必填<br>")
-    @PostMapping("/delCase")
-    @SysLogger("delCase")
+    @PostMapping("/logicDelCase")
+    @SysLogger("logicDelCase")
     @Transactional
     public RespDTO<AnalyzeDTO> logicDelCase(@RequestBody QcresultVO qcresultVO) {
-        qcresultVO.setType(2);
+        qcresultVO.setType(4);
         return RespDTO.onSuc(qcresultInfoFacade.changeQcResult(qcresultVO));
     }
 

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

@@ -13,6 +13,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Map;
+
 /**
  * <p>
  * 核查表 前端控制器
@@ -39,4 +41,14 @@ public class MedCheckInfoController {
         return RespDTO.onSuc(res);
     }
 
+
+
+    @ApiOperation(value = "获取核查人员列表[by:songxl]",
+            notes = "获取核查人员列表")
+    @PostMapping("/getCheckUserList")
+    @SysLogger("getCheckUserList")
+    public RespDTO<Map<String, Object>> getCheckUserList() {
+
+        return RespDTO.onSuc(null);
+    }
 }

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -38,7 +38,7 @@
         <result column="creator" property="creator"/>
         <result column="modifier" property="modifier"/>
         <result column="linkman" property="linkman"/>
-        <result column="explain" property="explain"/>
+        <result column="explainInfo" property="explain_info"/>
     </resultMap>
 
     <select id="getPage" resultType="com.diagbot.dto.BehospitalInfoDTO">
@@ -684,7 +684,7 @@
         SELECT b.`name` model_name,c.score,c.msg,c.cases_entry_id,c.is_reject,c.id id,c.info,
         a.cases_id cases_id, d.score cases_score,b.id model_id, a.name standard_msg,
         c.opt_type, c.grade_type, c.gmt_create, c.gmt_modified,
-        c.modifier,u.linkman,c.is_deleted,c.`explain`,
+        c.modifier,u.linkman,c.is_deleted,c.explain_info,
         a.type, a.drgs
         FROM `qc_cases_entry` a, qc_mode b, med_qcresult_detail c, qc_cases_hospital d ,sys_user u
         where a.is_deleted = 'N' and b.is_deleted = 'N' and  d.is_deleted = 'N'

src/main/resources/mapper/MedCheckInfoMapper.xml

@@ -17,6 +17,14 @@
         <result column="check_time" property="checkTime" />
         <result column="status" property="status" />
         <result column="check_type" property="checkType" />
+        <result column="create_status" property="createStatus" />
+        <result column="job_creator" property="jobCreator" />
+        <result column="job_creator_name" property="jobCreatorName" />
+        <result column="job_create_time" property="jobCreateTime" />
+        <result column="job_type" property="jobType" />
+        <result column="job_distributor" property="jobDistributor" />
+        <result column="job_distribution_name" property="jobDistributionName" />
+        <result column="job_distribution_time" property="jobDistributionTime" />
     </resultMap>
 
 </mapper>

src/main/resources/mapper/QcresultDetailMapper.xml

@@ -22,6 +22,7 @@
         <result column="creator" property="creator" />
         <result column="modifier" property="modifier" />
         <result column="remark" property="remark" />
+        <result column="explain_info" property="explainInfo" />
     </resultMap>
 
 </mapper>