杭州七院:按照模板创建日期查询

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

@@ -49,6 +49,11 @@ public class RecordContentDTO implements Serializable {
      */
     private String recTitle;
 
+    /**
+     * 医院文书时间
+     */
+    private String recDate;
+
     /**
      * 医院文书id
      */

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

@@ -36,7 +36,6 @@ import javax.validation.Valid;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -161,6 +160,9 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
     @Autowired
     BasDeptInfoFacade basDeptInfoFacade;
 
+    @Autowired
+    private BehospitalInfoFacade behospitalInfoFacade;
+
     @Autowired
     @Qualifier("qcRuleWarnServiceImpl")
     private QcRuleWarnServiceImpl qcRuleWarnServiceImpl;
@@ -1687,21 +1689,25 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
      * 评分
      */
     public void execute(TaskVO taskVO, String param) {
-        // 处理医院信息
-        dealTaskVO(param, taskVO);
-        // 类型过滤(1：出院时间比当前时间早4天前的病历（例如：长兴病历）)
-        if (taskVO.getType() != null && taskVO.getType() == 1) {
-            Date date = DateUtil.addDay(DateUtil.now(), -4);
-            taskVO.setLeaveDate(date);
-        }
-        // 近3天不含当天的病历强制评分更新
-        if (taskVO != null && ListUtil.isNotEmpty(taskVO.getIndividuation()) && taskVO.getIndividuation().contains(1)) {
-            // 4天前最早时间
-            taskVO.setStartLeaveDate(DateUtil.getFirstTimeOfDay(DateUtil.addDay(DateUtil.now(), -4)));
-            // 昨天最迟时间
-            taskVO.setEndLeaveDate(DateUtil.getLastTimeOfDay(DateUtil.addDay(DateUtil.now(), -1)));
-        }
-        List<BehospitalInfo> behospitalInfoList = getNoGrade(taskVO);
+//        // 处理医院信息
+//        dealTaskVO(param, taskVO);
+//        // 类型过滤(1：出院时间比当前时间早4天前的病历（例如：长兴病历）)
+//        if (taskVO.getType() != null && taskVO.getType() == 1) {
+//            Date date = DateUtil.addDay(DateUtil.now(), -4);
+//            taskVO.setLeaveDate(date);
+//        }
+//        // 近3天不含当天的病历强制评分更新
+//        if (taskVO != null && ListUtil.isNotEmpty(taskVO.getIndividuation()) && taskVO.getIndividuation().contains(1)) {
+//            // 4天前最早时间
+//            taskVO.setStartLeaveDate(DateUtil.getFirstTimeOfDay(DateUtil.addDay(DateUtil.now(), -4)));
+//            // 昨天最迟时间
+//            taskVO.setEndLeaveDate(DateUtil.getLastTimeOfDay(DateUtil.addDay(DateUtil.now(), -1)));
+//        }
+//        List<BehospitalInfo> behospitalInfoList = getNoGrade(taskVO);
+
+        List<BehospitalInfo> behospitalInfoList = behospitalInfoFacade.list(new QueryWrapper<BehospitalInfo>()
+                .le("behospital_date", taskVO.getEndLeaveDate())
+                .ge("behospital_date", taskVO.getStartLeaveDate()));
         for (BehospitalInfo bean : behospitalInfoList) {
             AnalyzeVO analyzeVO = new AnalyzeVO();
             analyzeVO.setIsTask(true);

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

@@ -26,10 +26,10 @@ public class TaskVO {
     // 个性化需求【1：近3天不含当天的病历强制评分更新】
     private List<Integer> individuation;
     // 出院时间过滤
-    @ApiModelProperty(hidden = true)
+//    @ApiModelProperty(hidden = true)
     private Date startLeaveDate;
     // 出院时间过滤
-    @ApiModelProperty(hidden = true)
+//    @ApiModelProperty(hidden = true)
     private Date endLeaveDate;
     // 是否使用CRF缓存
     private boolean useCrfCache;

src/main/resources/mapper/MedicalRecordMapper.xml

@@ -36,7 +36,7 @@
     </select>
 
     <select id="getRecordContent"  resultType="com.diagbot.dto.RecordContentDTO">
-        select t1.hospital_id,t1.rec_id, t1.rec_title, t1.rec_type_id, t1.mode_id , t2.name stand_model_name, t3.content_text, t3.html_text, t3.xml_text
+        select t1.hospital_id,t1.rec_id, t1.rec_date, t1.rec_title, t1.rec_type_id, t1.mode_id , t2.name stand_model_name, t3.content_text, t3.html_text, t3.xml_text
         from med_medical_record t1, qc_mode t2, med_medical_record_content t3
         where
             t1.is_deleted = 'N'