添加获取患者类型定时任务对外接口、修改获取患者病历列表接口

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

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

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

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

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

@@ -14,6 +14,7 @@ import com.diagbot.service.impl.MedCheckInfoServiceImpl;
 import com.diagbot.service.impl.MedicalRecordServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.ListUtil;
+import com.diagbot.util.StringUtil;
 import com.diagbot.util.SysUserUtils;
 import com.diagbot.vo.*;
 import lombok.extern.slf4j.Slf4j;
@@ -41,6 +42,8 @@ public class MedCheckWorkFacade {
     private MedBehospitalTypeServiceImpl medBehospitalTypeServiceImpl;
     @Autowired
     private MedicalRecordServiceImpl medicalRecordServiceImpl;
+    @Autowired
+    private SysTaskCronFacade sysTaskCronFacade;
 
     /**
      * @Author songxl
@@ -274,4 +277,22 @@ public class MedCheckWorkFacade {
         checkWorkPageVO.setHospitalId(Long.parseLong(SysUserUtils.getCurrentHospitalID()));
     }
 
+    public boolean getCheckListByUserId() {
+        //1.获取定时任务
+        SysTaskCron task = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
+                .eq("cron_code", "TASK019"), false);
+        //2.执行定时任务
+        if (null != task && StringUtil.isNotBlank(task.getCron())) {
+            try {
+                execute(task.getParam());
+            }
+            catch (Exception e)
+            {
+                e.printStackTrace();
+                return false;
+            }
+            return true;
+        }
+        return false;
+    }
 }

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

@@ -7,6 +7,7 @@ import com.diagbot.dto.CheckDeptDTO;
 import com.diagbot.dto.CheckJobDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.MedCheckInfoFacade;
+import com.diagbot.facade.MedCheckWorkFacade;
 import com.diagbot.vo.CheckJobPageVO;
 import com.diagbot.vo.CheckJobVO;
 import com.diagbot.vo.DistributionJobVO;
@@ -39,6 +40,8 @@ public class MedCheckInfoController {
 
     @Autowired
     MedCheckInfoFacade medCheckInfoFacade;
+    @Autowired
+    MedCheckWorkFacade medCheckWorkFacade;
 
     @ApiOperation(value = "核查数据接口[by:wangfeng]",
             notes = "核查数据接口")
@@ -96,4 +99,12 @@ public class MedCheckInfoController {
         List<CheckJobDTO> userInfos = medCheckInfoFacade.getCheckListByUserId(checkJobVO);
         return RespDTO.onSuc(userInfos);
     }
+
+    @ApiOperation(value = "质控核查--生成患者病历类型[by:songxl]",
+            notes = "生成患者病历类型")
+    @PostMapping("/createMedBeHospitalInfoType")
+    @SysLogger("createMedBeHospitalInfoType")
+    public RespDTO<Boolean> getCheckListByUserId() {
+        return RespDTO.onSuc(medCheckWorkFacade.getCheckListByUserId());
+    }
 }

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

@@ -55,8 +55,8 @@ public class MedCheckWorkController {
                     "name：病人姓名<br>" +
                     "doctorName：医生姓名<br>" +
                     "diagnose：主诊断<br>" +
-                    "sDay：最小天数<br>" +
-                    "lDay：最大天数<br>" +
+                    "smallDay：最小天数<br>" +
+                    "bigDay：最大天数<br>" +
                     "isPlacefile：是否归档<br>")
     @PostMapping("/getUserList")
     @SysLogger("getUserList")

src/main/resources/mapper/MedCheckInfoMapper.xml

@@ -232,7 +232,7 @@
         AND mbi.hospital_id = mqi.hospital_id AND mqi.is_deleted = 'N'
         LEFT JOIN med_behospital_type mbt ON mbi.behospital_code = mbt.behospital_code
         AND mbi.hospital_id = mbt.hospital_id AND mbt.is_deleted = 'N'
-        WHERE mbi.is_deleted = 'N'
+        WHERE mbi.is_deleted = 'N' and mqi.score_res is not null
         <if test="startDate != null">
             <![CDATA[ AND mbi.behospital_date >= #{startDate}]]>
         </if>