Merge branch 'develop' into dev/20200618_1.3.6

# Conflicts:
#	src/main/java/com/diagbot/config/ResourceServerConfigurer.java
#	src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

doc/010.20200617v1.3.5/qc_initv1.3.5.sql

@@ -1,9 +1,34 @@
 use `qc`;
 -- 技术服务部已执行
 -- ALTER TABLE `qc`.`bas_doctor_info` ADD COLUMN `group_id` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '小组id' AFTER `occup`;
+-- alter table `med_home_page` modify column `outpatient_emr_diagnose` varchar(500) DEFAULT NULL COMMENT '门急诊诊断';
+-- alter table `med_home_page` modify column `qc_nurse` varchar(255) DEFAULT NULL COMMENT '质控护士';
+-- alter table `med_home_page` modify column `encode_man` varchar(255) DEFAULT NULL COMMENT '编码员';
+-- alter table `med_home_page` modify column `dept_director` varchar(255) DEFAULT NULL COMMENT '科主任';
+-- alter table `med_home_page` modify column `cur_post_code` varchar(255) DEFAULT NULL COMMENT '现住址邮编';
+-- alter table `med_home_page` modify column `pathology_diagnose_id` varchar(255) DEFAULT NULL COMMENT '病理诊断编号';
+-- alter table `med_home_page` modify column `director_doctor` varchar(255) DEFAULT NULL COMMENT '主任医师';
+-- alter table `med_home_page` modify column `cur_phone` varchar(255) DEFAULT NULL COMMENT '现住址电话';
+-- alter table `med_home_page` modify column `leave_hospital_dept` varchar(255) DEFAULT NULL COMMENT '出院科别';
+-- alter table `med_home_page` modify column `response_nurse` varchar(255) DEFAULT NULL COMMENT '责任护士';
 
 -- UPDATE `sys_permission` SET is_deleted = 'Y' WHERE permissionUrl LIKE '/console%' AND is_deleted='N';
 
 -- UPDATE sys_menu_permission SET is_deleted='Y' where permission_id in(select id from  `sys_permission`  WHERE permissionUrl LIKE '/console%') AND is_deleted='N';
 
 -- UPDATE sys_role_permission SET is_deleted='Y'where permission_id in(select id from  `sys_permission`  WHERE permissionUrl LIKE '/console%') AND is_deleted='N';
+
+-- 新增权限
+INSERT INTO `sys_permission`(`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `name`, `code`, `permissionUrl`, `method`, `descritpion`, `remark`) VALUES (94, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '条目缺陷占比质控详情页（全院）', 'FUNC000094', '/console/qcResultShortPage', 'ALL', '数据报表明细-条目缺陷占比-条目缺陷占比质控详情页（全院）', NULL);
+INSERT INTO `sys_permission`(`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `name`, `code`, `permissionUrl`, `method`, `descritpion`, `remark`) VALUES (95, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '条目缺陷占比质控详情页（科室）', 'FUNC000095', '/consoleByDept/qcResultShortByDeptPage', 'ALL', '数据报表明细（科室）-条目缺陷占比-条目缺陷占比质控详情页（科室）', NULL);
+INSERT INTO `sys_role_permission`(`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `role_id`, `permission_id`, `remark`) VALUES (1623, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', -1, 94, '数据报表明细-条目缺陷占比-条目缺陷占比质控详情页（全院）');
+INSERT INTO `sys_role_permission`(`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `role_id`, `permission_id`, `remark`) VALUES (1624, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', -1, 95, '数据报表明细（科室）-条目缺陷占比-条目缺陷占比质控详情页（科室）');
+INSERT INTO `sys_menu_permission`(`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `menu_id`, `permission_id`, `remark`) VALUES (66, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 20, 94, '数据报表明细-条目缺陷占比-条目缺陷占比质控详情页（全院）');
+INSERT INTO `sys_menu_permission`(`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `menu_id`, `permission_id`, `remark`) VALUES (67, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 27, 95, '数据报表明细（科室）-条目缺陷占比-条目缺陷占比质控详情页（科室）');
+
+
+ALTER TABLE `med_behospital_info` ADD INDEX `idx_beh_dept_id` (`beh_dept_id`) USING BTREE;
+
+-- 所有环境、技术服务部已经同步
+-- DROP INDEX advice_behospital_code_unique ON med_doctor_advice;
+-- ALTER TABLE med_doctor_advice ADD UNIQUE KEY `advice_behospital_code_unique` (`doctor_advice_id`,`hospital_id`,`behospital_code`) USING BTREE;

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

@@ -116,6 +116,19 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/console/export/entryGroupByEntryExport").permitAll()
                 .antMatchers("/console/export/levelExport").permitAll()
                 .antMatchers("/console/export/levelExport_TZ").permitAll()
+                .antMatchers("/qc/data/sendDoctorInfos").permitAll()
+                .antMatchers("/qc/data/sendDeptInfos").permitAll()
+                .antMatchers("/qc/data/sendRecordTypes").permitAll()
+                .antMatchers("/qc/data/sendMrRecordIng").permitAll()
+                .antMatchers("/qc/data/sendMrContent").permitAll()
+                .antMatchers("/qc/data/sendMrRecord").permitAll()
+                .antMatchers("/qc/data/sendPatientInfo").permitAll()
+                .antMatchers("/qc/data/sendDoctorAdvice").permitAll()
+                .antMatchers("/qc/data/sendHomePageIng").permitAll()
+                .antMatchers("/qc/data/sendHomePage").permitAll()
+                .antMatchers("/qc/data/sendHomeDiagnose").permitAll()
+                .antMatchers("/qc/data/sendHomeOperation").permitAll()
+                .antMatchers("/qc/data/sendCrisis").permitAll()
                 .antMatchers("/**").authenticated();
         //                .antMatchers("/**").permitAll();
     }

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

@@ -159,6 +159,19 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/console/export/entryGroupByEntryExport", request)
                 || matchers("/console/export/levelExport", request)
                 || matchers("/console/export/levelExport_TZ", request)
+                || matchers("/qc/data/sendDoctorInfos", request)
+                || matchers("/qc/data/sendDeptInfos", request)
+                || matchers("/qc/data/sendRecordTypes", request)
+                || matchers("/qc/data/sendMrRecordIng", request)
+                || matchers("/qc/data/sendMrContent", request)
+                || matchers("/qc/data/sendMrRecord", request)
+                || matchers("/qc/data/sendPatientInfo", request)
+                || matchers("/qc/data/sendDoctorAdvice", request)
+                || matchers("/qc/data/sendHomePageIng", request)
+                || matchers("/qc/data/sendHomePage", request)
+                || matchers("/qc/data/sendHomeDiagnose", request)
+                || matchers("/qc/data/sendHomeOperation", request)
+                || matchers("/qc/data/sendCrisis", request)
                 || matchers("/", request)) {
             return true;
         }

src/main/java/com/diagbot/dto/data/ABehospitalInfoDTO.java

@@ -100,12 +100,42 @@ public class ABehospitalInfoDTO{
     private String diagnose;
 
     /**
-     * 医生ID
+     * 住院医生ID
+     */
+    private String behDoctorId;
+
+    /**
+     * 住院医生姓名
+     */
+    private String behDoctorName;
+
+    /**
+     * 主治医生ID
      */
     private String doctorId;
 
     /**
-     * 医生姓名
+     * 主治医生姓名
      */
     private String doctorName;
+
+    /**
+     * 主任医生ID
+     */
+    private String directorDoctorId;
+
+    /**
+     * 主任医生姓名
+     */
+    private String directorDoctorName;
+
+    /**
+     * 是否归档（0：未归档，1：已归档）
+     */
+    private String isPlacefile;
+
+    /**
+     * 归档时间
+     */
+    private String placefileDate;
 }

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

@@ -359,7 +359,12 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         //  调用质控接口
         Response<OutputInfo> response = qcServiceClient.extract(queryVo);
         if (response == null || response.getData() == null) {
-            throw new CommonException(CommonErrorCode.RPC_ERROR, "远程质控接口没有返回数据!【" + analyzeVO.getBehospitalCode() + "】");
+            if (null == response) {
+                throw new CommonException(CommonErrorCode.RPC_ERROR, "远程质控接口没有返回数据!【" + analyzeVO.getBehospitalCode() + "】");
+            } else {
+                throw new CommonException(CommonErrorCode.RPC_ERROR,
+                        "远程质控接口没有返回数据!【" + analyzeVO.getBehospitalCode() + "】错误原因:" + response.getMsg());
+            }
         }
         OutputInfo outputInfo = response.getData();
         //根据质控结果获取质控条目
@@ -856,7 +861,12 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         //  调用质控接口
         Response<OutputInfo> response = qcServiceClient.extract(queryVo);
         if (response == null || response.getData() == null) {
-            throw new CommonException(CommonErrorCode.RPC_ERROR, "远程质控接口没有返回数据!");
+            if (null == response) {
+                throw new CommonException(CommonErrorCode.RPC_ERROR, "远程质控接口没有返回数据!【" + analyzeVO.getBehospitalCode() + "】");
+            } else {
+                throw new CommonException(CommonErrorCode.RPC_ERROR,
+                        "远程质控接口没有返回数据!【" + analyzeVO.getBehospitalCode() + "】错误原因:" + response.getMsg());
+            }
         }
         OutputInfo outputInfo = response.getData();
         //根据质控结果获取质控条目

src/main/java/com/diagbot/facade/data/ABehospitalInfoFacade.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ABehospitalInfoDTO;
 import com.diagbot.entity.*;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.facade.QcAbnormalFacade;
 import com.diagbot.facade.QcTypeFacade;
 import com.diagbot.service.impl.BehospitalInfoServiceImpl;
@@ -79,6 +80,9 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 if(StringUtil.isNotBlank(s.getBehospitalDate())){
                     behospitalInfo.setBehospitalDate(DateUtil.parseDateTime(s.getBehospitalDate()));
                 }
+                if(StringUtil.isNotBlank(s.getPlacefileDate())){
+                    behospitalInfo.setPlacefileDate(DateUtil.parseDateTime(s.getPlacefileDate()));
+                }
                 behospitalInfoList.add(behospitalInfo);
 
             });
@@ -108,8 +112,9 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
         List<BehospitalInfo> updateE = Lists.newLinkedList();
         behospitalInfoList.stream().forEach(s -> {
             BehospitalInfo behospitalInfo = this.getOne(new QueryWrapper<BehospitalInfo>()
-            .eq("behospital_code", s.getBehospitalCode())
-            .eq("hospital_id", s.getHospitalId()));
+                    .eq("behospital_code", s.getBehospitalCode())
+                    .eq("hospital_id", s.getHospitalId())
+                    .eq("is_deleted",IsDeleteEnum.N));
             if (behospitalInfo != null) {
                 s.setGmtModified(new Date());
                 s.setQcTypeId(initQcTypeId(s));
@@ -139,11 +144,13 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
         MedicalRecord medicalRecord = aMedicalRecordFacade.getOne(new QueryWrapper<MedicalRecord>()
                 .eq("behospital_code", s.getBehospitalCode())
                 .eq("hospital_id", s.getHospitalId())
-                .eq("mode_id", Long.valueOf("1")));
+                .eq("mode_id", Long.valueOf("1"))
+                .eq("is_deleted",IsDeleteEnum.N));
         if(medicalRecord!=null){
             QcType qcType=qcTypeFacade.getOne(new QueryWrapper<QcType>()
                     .eq("name",medicalRecord.getRecTitle())
-                    .eq("hospital_id", s.getHospitalId()));
+                    .eq("hospital_id", s.getHospitalId())
+                    .eq("is_deleted",IsDeleteEnum.N));
             if(qcType!=null){
                 qcTypeId=qcType.getId();
             }else{

src/main/java/com/diagbot/facade/data/AHomePageFacade.java

@@ -160,7 +160,12 @@ public class AHomePageFacade extends HomePageServiceImpl{
         String behospitalCode =aHomePageIngVO.getHomePages().get(0).getBehospitalCode();
         Long hospitalId=aHomePageIngVO.getHomePages().get(0).getHospitalId();
         Long modeId=Long.valueOf("6");//病案首页默认为6
-        if(aHomePageIngVO.getDockModeType().equals("1")){
+        if(aHomePageIngVO.getDockModeType().equals("0")){
+            Map<String,Object> map=new HashMap<String,Object>();
+            List<AHomePageDTO> homePageDtoList=BeanUtil.listCopyTo(aHomePageIngVO.getHomePages(),AHomePageDTO.class);
+            map.put("homePages",homePageDtoList);
+            return RespDTO.onSuc(map);
+        }else if(aHomePageIngVO.getDockModeType().equals("1")){
             //页面模式
             String url=readProperties.getProcessQcUrl()+"?behospitalCode="+behospitalCode+"&hospitalId="+hospitalId+"&modeId="+modeId;
             Map<String,Object> map=new HashMap<String,Object>();

src/main/java/com/diagbot/facade/data/AMedRecordTypeFacade.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.AMedicalRecordTypeDTO;
 import com.diagbot.entity.MedRecordType;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.MedRecordTypeServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.TZDBConn;
@@ -69,7 +70,8 @@ public class AMedRecordTypeFacade extends MedRecordTypeServiceImpl {
             medRecordTypeList.stream().forEach(s -> {
                 MedRecordType mrType = this.getOne(new QueryWrapper<MedRecordType>()
                         .eq("type_id", s.getTypeId())
-                        .eq("hospital_id", s.getHospitalId()));
+                        .eq("hospital_id", s.getHospitalId())
+                        .eq("is_deleted",IsDeleteEnum.N));
                 if (mrType != null) {
                     s.setGmtModified(new Date());
                     updateE.add(s);

src/main/java/com/diagbot/facade/data/AMedicalRecordFacade.java

@@ -6,6 +6,7 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.AMedicalRecordDTO;
 import com.diagbot.dto.data.AMrContentDTO;
 import com.diagbot.entity.*;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.facade.BehospitalInfoFacade;
 import com.diagbot.facade.ModelHospitalFacade;
 import com.diagbot.facade.QcTypeFacade;
@@ -152,7 +153,12 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
         MedicalRecord medicalRecord=new MedicalRecord();
         BeanUtil.copyProperties(aMrContentVO.getRecords().get(0),medicalRecord);
         Long modeId=initModeId(medicalRecord);
-        if(aMrContentVO.getDockModeType().equals("1")){
+        if(aMrContentVO.getDockModeType().equals("0")){
+            Map<String,Object> map=new HashMap<String,Object>();
+            List<AMedicalRecordDTO> medicalRecordDTOList = BeanUtil.listCopyTo(aMrContentVO.getRecords(), AMedicalRecordDTO.class);
+            map.put("records",medicalRecordDTOList);
+            return RespDTO.onSuc(map);
+        }else if(aMrContentVO.getDockModeType().equals("1")){
             if(modeId==0 || modeId==null){
                 return RespDTO.onError("无对应的文书类型");
             }
@@ -222,7 +228,8 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
                         Long qcTypeId=Long.valueOf("0");
                         QcType qcType=qcTypeFacade.getOne(new QueryWrapper<QcType>()
                                 .eq("name",s.getRecTitle())
-                                .eq("hospital_id", s.getHospitalId()));
+                                .eq("hospital_id", s.getHospitalId())
+                                .eq("is_deleted",IsDeleteEnum.N));
                         if(qcType!=null){
                             behospitalInfo.setQcTypeId(qcType.getId());
                         }else{

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

@@ -32,6 +32,10 @@ public class QcResultShortPageVO extends Page {
      * 条目名称
      */
     private String casesEntryName;
+    /**
+     * 条目id
+     */
+    private Long casesEntryId;
     /**
      * 科室名称
      */
@@ -48,4 +52,14 @@ public class QcResultShortPageVO extends Page {
     private Date startDate;
     @NotNull(message = "请输入截止时间")
     private Date endDate;
+
+    /**
+     * 单项否决
+     */
+    private Integer isReject;
+
+    /**
+     * 规则类型(0：无，1：空项，2：错误)
+     */
+    private Integer ruleType;
 }

src/main/java/com/diagbot/vo/data/ABehospitalInfoVO.java

@@ -2,8 +2,6 @@ package com.diagbot.vo.data;
 
 import lombok.Data;
 
-import java.util.Date;
-
 @Data
 public class ABehospitalInfoVO {
     /**
@@ -131,4 +129,14 @@ public class ABehospitalInfoVO {
      */
     private String directorDoctorName;
 
+    /**
+     * 是否归档（0：未归档，1：已归档）
+     */
+    private String isPlacefile;
+
+    /**
+     * 归档时间
+     */
+    private String placefileDate;
+
 }

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

@@ -154,13 +154,15 @@ public class BehospitalInfoController {
         return RespDTO.onSuc(qcresultInfoFacade.changeQcResult(qcresultVO));
     }
 
-    @ApiOperation(value = "对病历进行评分[by:zhoutg]",
+    @ApiOperation(value = "对病历进行评分【****************批量评分*************】[by:zhoutg]",
             notes = "参数内容清空：【所有医院】【未评分】病历数据<br>" +
                     "<br>" +
-                    "type：类型过滤(1：出院时间比当前时间早3天前的病历（例如：长兴病历）)<br>" +
                     "hosptialIdList：医院列表id，1：长兴，3：台州，2：邵逸夫<br>" +
-                    "filterFlag： 筛选病历数据：0：未评分的病历，【推荐使用】；1：全部病历,【谨慎使用】<br>" +
-                    "useCrfCache: 是否使用crf缓存（true：使用crf缓存，false：不使用）")
+                    "useCrfCache: 是否使用crf缓存（true：使用crf缓存，false：不使用）<br>" +
+                    "【个性化需求】——默认即可<br>" +
+                    "filterFlag： 筛选病历数据：0：未评分的病历【推荐使用】；1：全部病历【谨慎使用】<br>" +
+                    "individuation：【1：近3天不含当天的病历强制评分更新】<br>" +
+                    "type：【1：出院时间比当前时间早3天前的病历（例如：长兴病历）】)<br>")
     @PostMapping("/execule")
     @SysLogger("execule")
     public RespDTO<Boolean> execule(@RequestBody TaskVO taskVO) {

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

@@ -213,9 +213,12 @@ public class ConsoleByDeptController {
             notes = "behospitalCode： 病历号)<br>" +
                     "patName： 病人姓名 <br>" +
                     "casesEntryName： 条目名称 <br>" +
+                    "casesEntryId： 条目id <br>" +
                     "behDeptName：科室名称 <br>" +
                     "doctorName：主治医生名称 <br>" +
                     "level： 病历等级 <br>" +
+                    "isReject： 单项否决 1-否决，0-非<br>" +
+                    "ruleType： 规则类型 0：无，1：空项，2：错误<br>" +
                     "startDate： 起始时间 <br>" +
                     "endDate： 截止时间 <br>")
     @PostMapping("/qcResultShortByDeptPage")

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

@@ -456,8 +456,11 @@ public class ConsoleController {
             notes = "behospitalCode： 病历号)<br>" +
                     "patName： 病人姓名 <br>" +
                     "casesEntryName： 条目名称 <br>" +
+                    "casesEntryId： 条目id <br>" +
                     "behDeptName：科室名称 <br>" +
                     "level： 病历等级 <br>" +
+                    "isReject： 单项否决 1-否决，0-非<br>" +
+                    "ruleType： 规则类型 0：无，1：空项，2：错误<br>" +
                     "startDate： 起始时间 <br>" +
                     "endDate： 截止时间 <br>")
     @PostMapping("/qcResultShortPage")

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -2790,6 +2790,15 @@
         <if test="qcResultShortPageVO.casesEntryName != null and qcResultShortPageVO.casesEntryName != ''">
             AND d.NAME LIKE CONCAT( '%', #{qcResultShortPageVO.casesEntryName}, '%' )
         </if>
+        <if test="qcResultShortPageVO.casesEntryId != null and qcResultShortPageVO.casesEntryId != ''">
+            AND d.id = #{qcResultShortPageVO.casesEntryId}
+        </if>
+        <if test="qcResultShortPageVO.isReject != null">
+            AND c.is_reject = #{qcResultShortPageVO.isReject}
+        </if>
+        <if test="qcResultShortPageVO.ruleType != null">
+            AND d.rule_type = #{qcResultShortPageVO.ruleType}
+        </if>
         ) t1
         LEFT JOIN med_home_page t2 ON t1.hospital_id = t2.hospital_id
         AND t1.behospital_code = t2.behospital_code
@@ -2875,6 +2884,15 @@
         <if test="qcResultShortPageVO.casesEntryName != null and qcResultShortPageVO.casesEntryName != ''">
             AND d.NAME LIKE CONCAT( '%', #{qcResultShortPageVO.casesEntryName}, '%' )
         </if>
+        <if test="qcResultShortPageVO.casesEntryId != null and qcResultShortPageVO.casesEntryId != ''">
+            AND d.id = #{qcResultShortPageVO.casesEntryId}
+        </if>
+        <if test="qcResultShortPageVO.isReject != null">
+            AND c.is_reject = #{qcResultShortPageVO.isReject}
+        </if>
+        <if test="qcResultShortPageVO.ruleType != null">
+            AND d.rule_type = #{qcResultShortPageVO.ruleType}
+        </if>
         ) t1
         LEFT JOIN med_home_page t2 ON t1.hospital_id = t2.hospital_id
         AND t1.behospital_code = t2.behospital_code
@@ -2954,6 +2972,12 @@
                 <if test="item.directorDoctorName != null">
                     director_doctor_name = #{item.directorDoctorName},
                 </if>
+                <if test="item.placefileDate != null">
+                    placefile_date = #{item.placefileDate},
+                </if>
+                <if test="item.isPlacefile != null">
+                    is_placefile = #{item.isPlacefile},
+                </if>
                 <if test="item.gmtModified != null">
                     gmt_modified = #{item.gmtModified},
                 </if>

src/main/resources/mapper/QcresultInfoMapper.xml

@@ -1014,17 +1014,14 @@
             med_qcresult_info c,
         </if>
         med_qcresult_detail d,
-        qc_cases_entry e,
-        qc_cases_entry_hospital f
+        qc_cases_entry e
         WHERE
         a.is_deleted = 'N'
         AND c.is_deleted = 'N'
         AND d.is_deleted = 'N'
         and e.is_deleted='N'
-        and f.is_deleted='N'
         AND a.hospital_id = c.hospital_id
         and a.hospital_id = d.hospital_id
-        and a.hospital_id = f.hospital_id
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = d.behospital_code
         AND a.is_placefile = '1'
@@ -1033,7 +1030,6 @@
         </if>
         AND d.cases_id = e.cases_id
         AND d.cases_entry_id = e.id
-        and e.id = f.cases_entry_id
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="filterPageVO.casesId != null and filterPageVO.casesId != 0">
             AND d.cases_id = #{filterPageVO.casesId}
@@ -1074,17 +1070,14 @@
             med_qcresult_info c,
         </if>
         med_qcresult_detail d,
-        qc_cases_entry e,
-        qc_cases_entry_hospital f
+        qc_cases_entry e
         WHERE
         a.is_deleted = 'N'
         AND c.is_deleted = 'N'
         AND d.is_deleted = 'N'
         and e.is_deleted='N'
-        and f.is_deleted='N'
         AND a.hospital_id = c.hospital_id
         and a.hospital_id = d.hospital_id
-        and a.hospital_id = f.hospital_id
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = d.behospital_code
         AND a.is_placefile = '1'
@@ -1093,7 +1086,6 @@
         </if>
         AND d.cases_id = e.cases_id
         AND d.cases_entry_id = e.id
-        and e.id = f.cases_entry_id
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="filterPageVO.casesId != null and filterPageVO.casesId != 0">
             AND d.cases_id = #{filterPageVO.casesId}
@@ -1394,19 +1386,16 @@
         </if>
         med_qcresult_detail d,
         qc_cases_entry e,
-        sys_user_dept f,
-        qc_cases_entry_hospital g
+        sys_user_dept f
         WHERE
         a.is_deleted = 'N'
         AND c.is_deleted = 'N'
         AND d.is_deleted = 'N'
         AND e.is_deleted = 'N'
         AND f.is_deleted = 'N'
-        AND g.is_deleted = 'N'
         AND a.hospital_id = c.hospital_id
         AND a.hospital_id = d.hospital_id
         AND a.hospital_id = f.hospital_id
-        AND a.hospital_id = g.hospital_id
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = d.behospital_code
         AND a.is_placefile = '1'
@@ -1415,7 +1404,6 @@
         </if>
         AND d.cases_id = e.cases_id
         AND d.cases_entry_id = e.id
-        AND g.cases_entry_id = e.id
         AND a.beh_dept_id = f.dept_id
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="filterPageByDeptVO.casesId != null and filterPageByDeptVO.casesId != 0">
@@ -1469,19 +1457,16 @@
         </if>
         med_qcresult_detail d,
         qc_cases_entry e,
-        sys_user_dept f,
-        qc_cases_entry_hospital g
+        sys_user_dept f
         WHERE
         a.is_deleted = 'N'
         AND c.is_deleted = 'N'
         AND d.is_deleted = 'N'
         AND e.is_deleted = 'N'
         AND f.is_deleted = 'N'
-        AND g.is_deleted = 'N'
         AND a.hospital_id = c.hospital_id
         AND a.hospital_id = d.hospital_id
         AND a.hospital_id = f.hospital_id
-        AND a.hospital_id = g.hospital_id
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = d.behospital_code
         AND a.is_placefile = '1'
@@ -1490,7 +1475,6 @@
         </if>
         AND d.cases_id = e.cases_id
         AND d.cases_entry_id = e.id
-        AND g.cases_entry_id = e.id
         AND a.beh_dept_id = f.dept_id
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="filterPageByDeptVO.casesId != null and filterPageByDeptVO.casesId != 0">