wangsy 3 лет назад
Родитель
Сommit
dc074c9ac0

+ 1 - 6
src/main/java/com/diagbot/mapper/MedAppealInfoMapper.java

@@ -16,12 +16,7 @@ import java.util.List;
  * @since 2022-01-20
  */
 public interface MedAppealInfoMapper extends BaseMapper<MedAppealInfo> {
-    /**
-     * 条目缺陷质控评分详情页导出到excel-湘雅
-     *
-     * @param
-     * @return
-     */
+
     public List<ABelowDTO> getExampleStatus(@Param("behospitalCodeList")List<String> behospitalCodeList);
 
 }

+ 18 - 6
src/main/java/com/diagbot/vo/data/ABelowVO.java

@@ -19,14 +19,26 @@ public class ABelowVO {
     private String behDeptName;
 
     /**
-     * 入院时间
+     * 入院开始时间
      */
-    @ApiModelProperty("入院时间")
-    private String behospitalDate;
+    @ApiModelProperty("入院开始时间")
+    private String behospitalStartDate;
 
     /**
-     * 出院时间
+     * 入院结束时间
      */
-    @ApiModelProperty("出院时间")
-    private String leaveHospitalDate;
+    @ApiModelProperty("入院结束时间")
+    private String behospitalEndDate;
+
+    /**
+     * 出院开始时间
+     */
+    @ApiModelProperty("出院开始时间")
+    private String leaveHospitalStartDate;
+
+    /**
+     * 出院结束时间
+     */
+    @ApiModelProperty("出院结束时间")
+    private String leaveHospitalEndDate;
 }

+ 4 - 2
src/main/java/com/diagbot/web/DataController.java

@@ -238,8 +238,10 @@ public class DataController {
     @ApiOperation(value = "甲级以下病历统计",
             notes = "hospitalId:医院编码<br>" +
                     "behDeptName:住院科室名称<br>" +
-                    "behospitalDate:入院时间<br>" +
-                    "leaveHospitalDate:出院时间<br>")
+                    "behospitalStartDate:入院开始时间<br>" +
+                    "behospitalEndDate:入院结束时间<br>" +
+                    "leaveHospitalStartDate:出院开始时间<br>" +
+                    "leaveHospitalEndDate:出院结束时间<br>")
     @PostMapping("/belowHospitalList")
     @SysLogger("belowHospitalList")
     public RespDTO<List<ABelowDTO>> belowHospitalList(@RequestBody ABelowVO aBelowVO) {

+ 10 - 4
src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -19783,11 +19783,17 @@
         <if test="behDeptName != null and behDeptName !=''">
             AND m1.beh_dept_name=#{behDeptName}
         </if>
-        <if test="behospitalDate != null and behospitalDate !=''">
-            <![CDATA[ AND m1.behospital_date >= #{behospitalDate}]]>
+        <if test="behospitalStartDate != null and behospitalStartDate !=''">
+            <![CDATA[ AND m1.behospital_date >= #{behospitalStartDate}]]>
         </if>
-        <if test="leaveHospitalDate != null and leaveHospitalDate !=''">
-            <![CDATA[ AND m1.leave_hospital_date <= #{leaveHospitalDate}]]>
+        <if test="behospitalEndDate != null and behospitalEndDate !=''">
+            <![CDATA[ AND m1.behospital_date <= #{behospitalEndDate}]]>
+        </if>
+        <if test="leaveHospitalStartDate != null and leaveHospitalStartDate !=''">
+            <![CDATA[ AND m1.leave_hospital_date >= #{leaveHospitalStartDate}]]>
+        </if>
+        <if test="leaveHospitalEndDate != null and leaveHospitalEndDate !=''">
+            <![CDATA[ AND m1.leave_hospital_date <= #{leaveHospitalEndDate}]]>
         </if>
         AND m1.behospital_code = m2.behospital_code
     </select>