脚本

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

@@ -14,8 +14,6 @@ import lombok.Setter;
 @Setter
 public class MedicalCheckTitleDTO {
 
-
-
     //字符串目标id集
     @Excel(name = "字符串目标id集",isColumnHidden = true,needMerge = true)
     private String casesEntryId;
@@ -108,9 +106,4 @@ public class MedicalCheckTitleDTO {
     @Excel(name = "住院30天阶段小结",width = 16)
     private Integer wywwcxj= 0;
 
-
-
-
-
-
 }

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

@@ -1340,13 +1340,13 @@ public List<MedicalCheckExportDTO> medicalCheckExport(@Param("filterVO") FilterM
         //实体类中的子集合
         List<MedicalCheckTitleDTO> medicalTitles=  new ArrayList<MedicalCheckTitleDTO>();
 
-       //map集合来对查询出来的条目id进行统计出现的次数来确定统计的数量
-        Map<String, Object> targetMap = new HashMap<String, Object>();
 //        每条数据的目标id集，和面来判断统计次数
         String casesEntryId = null;
         //获取医生名称/目标条目集合在循环里面
         List<MedicalCheckTitleDTO> medicalCheckTitleDTOS = record.getMedicalCheckTitleDTOS();
         for (MedicalCheckTitleDTO medicalCheckTitleDTO : medicalCheckTitleDTOS) {
+            //map集合来对查询出来的条目id进行统计出现的次数来确定统计的数量
+            Map<String, Object> targetMap = new HashMap<String, Object>();
             //子集合的实体类
             MedicalCheckTitleDTO medicalTitleDTOS =  new MedicalCheckTitleDTO();
             medicalTitleDTOS.setDoctorName(medicalCheckTitleDTO.getDoctorName());
@@ -1478,7 +1478,6 @@ public List<MedicalCheckExportDTO> medicalCheckExport(@Param("filterVO") FilterM
         List<MedicalCheckDTO> records = medicalCheck.getRecords();
         List<MedicalCheckDTO> targetList = Lists.newArrayList();
         for (MedicalCheckDTO record : records) {
-
             MedicalCheckDTO medicalCheckDTO = new MedicalCheckDTO();
             medicalCheckDTO.setDeptId(record.getDeptId());
             medicalCheckDTO.setDeptName(record.getDeptName());

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

@@ -37,14 +37,11 @@ public class MedLisInfoFacade extends MedLisInfoServiceImpl {
     public IPage<ExamineInfoDTO> getExaminePage(ExamineInfoVO examineInfoVO) {
         //examineInfoVO.setHospitalId(Long.valueOf(SysUserUtils.getCurrentHospitalID()));
         examineInfoVO.setHospitalId(2l);
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
         if (null != examineInfoVO.getJyDateStart()) {
-
-            String jyDateStart = simpleDateFormat.format(examineInfoVO.getJyDateStart());
-            examineInfoVO.setJyNewDateStart(jyDateStart); }
+            examineInfoVO.setJyDateStart(DateUtil.getFirstTimeOfDay(examineInfoVO.getJyDateStart()));
+          }
         if (null != examineInfoVO.getJyDateEnd()) {
-            String jyDateEnd = simpleDateFormat.format(examineInfoVO.getJyDateEnd());
-            examineInfoVO.setJyNewDateEnd(jyDateEnd);
+            examineInfoVO.setJyDateEnd(DateUtil.getFirstTimeOfDay(DateUtil.addDay(examineInfoVO.getJyDateEnd(), 1)));
         }
         if (null != examineInfoVO.getJyDateStart() && null != examineInfoVO.getJyDateEnd()) {
             if (DateUtil.after(examineInfoVO.getJyDateStart(), examineInfoVO.getJyDateEnd())) {

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

@@ -49,12 +49,6 @@ public class ExamineInfoVO extends Page {
      */
     private Date jyDateStart;
 
-    /**
-     * 转化后检验时间开始
-     */
-    @ApiModelProperty(hidden = true)
-    private String jyNewDateStart;
-
 
     /**
      * 检验时间结束
@@ -62,11 +56,6 @@ public class ExamineInfoVO extends Page {
     private Date jyDateEnd;
 
 
-    /**
-     * 转化后检验时间结束
-     */
-    @ApiModelProperty(hidden = true)
-    private String jyNewDateEnd;
 
     /**
      *

src/main/resources/mapper/MedLisInfoMapper.xml

@@ -60,11 +60,11 @@
         <if test="examineInfoVO.examineItemName != null and examineInfoVO.examineItemName != ''">
             and t1.rep_name like CONCAT('%',#{examineInfoVO.examineItemName},'%')
         </if>
-        <if test="examineInfoVO.jyNewDateStart != null">
-            <![CDATA[ AND date_format(t1.check_date,'%Y/%m/%d HH:mm:ss') >= #{examineInfoVO.jyNewDateStart}]]>
+        <if test="examineInfoVO.jyDateStart != null">
+            <![CDATA[ AND date_format(t1.check_date,'%Y-%m-%d %H:%i:%s') >= #{examineInfoVO.jyDateStart}]]>
         </if>
-        <if test="examineInfoVO.jyNewDateEnd != null">
-            <![CDATA[ AND date_format(t1.check_date,'%Y/%m/%d HH:mm:ss') <= #{examineInfoVO.jyNewDateEnd}]]>
+        <if test="examineInfoVO.jyDateEnd != null">
+            <![CDATA[ AND date_format(t1.check_date,'%Y-%m-%d %H:%i:%s') <= #{examineInfoVO.jyDateEnd}]]>
         </if>) b
         where 1=1
         <if test="examineInfoVO.examineType != null and examineInfoVO.examineType == 1">