更新

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

@@ -54,6 +54,18 @@ public class MedQualityControlDTO {
     @Excel(name = "手术记录24小时内完成率", width = 12, orderNum = "5")
     private String operationStr;
 
+    /**
+     * 手术相关记录完整量
+     */
+    private Double  operationRecordNum;
+
+    /**
+     * 手术相关记录完整率
+     */
+    @Excel(name = "手术相关记录完整率", width = 12, orderNum = "5")
+    private String operationRecordStr  = "0.00%";
+
+
     /**
      * 出院记录24小时内完成量
      */
@@ -85,7 +97,7 @@ public class MedQualityControlDTO {
      * 医师查房记录完成率
      */
     @Excel(name = "医师查房记录完成率",width = 12, orderNum = "8")
-    private String WardRoundStr;
+    private String WardRoundStr = "0.00%";
 
     /**
      * 临床用血相关记录符合量
@@ -93,7 +105,7 @@ public class MedQualityControlDTO {
     @Excel(name = "临床用血相关记录符合率",width = 12, orderNum = "8")
     private Double bloodNum;
     //临床用血相关记录符合率
-    private String bloodStr;
+    private String bloodStr = "0.00%";
 
     /**
      * 患者抢救记录6h完成量
@@ -104,7 +116,7 @@ public class MedQualityControlDTO {
      * 患者抢救记录6h完成率
      */
     @Excel(name = "患者抢救记录完成率",width = 12, orderNum = "9")
-    private String rescueStr;
+    private String rescueStr = "0.00%";
 
     /**
      * 出院患者病历2日归档量
@@ -115,7 +127,7 @@ public class MedQualityControlDTO {
      * 出院患者病历2日归档率
      */
     @Excel(name = "出院患者病历2日归档完整率",width = 12, orderNum = "10")
-    private String leaveSecFileStr;
+    private String leaveSecFileStr = "0.00%";
 
     /**
      * 出院患者病历归档完整量
@@ -170,7 +182,7 @@ public class MedQualityControlDTO {
      * 甲级病历率
      */
     @Excel(name = "扣分",width = 12, orderNum = "15")
-    private String firGradeStr;
+    private String firGradeStr = "0.00%";
 
     /**
      * CT检查记录符合率

src/main/java/com/diagbot/entity/MedManagementInfo.java

@@ -2,6 +2,7 @@ package com.diagbot.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.time.LocalDateTime;
@@ -36,11 +37,13 @@ public class MedManagementInfo implements Serializable {
     /**
      * 开始时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private LocalDateTime startDate;
 
     /**
      * 结束时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private LocalDateTime endDate;
 
     /**

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

@@ -2507,8 +2507,8 @@ public class ConsoleFacade {
     private MedQualityControlDTO operationMethod(MedQualityControlDTO medQualityControlDTO, String operationFeeNum, Map<String, Long> triggeringRulesMap){
         if( triggeringRulesMap.containsKey("operationRecordNum") && StringUtils.isNotEmpty(operationFeeNum) && ! operationFeeNum.equals("0")){
             double operationRecordDo = currencyCal(operationFeeNum, triggeringRulesMap.get("operationRecordNum"));
-            medQualityControlDTO.setOperationNum(operationRecordDo);
-            medQualityControlDTO.setOperationStr(operationRecordDo+"%");
+            medQualityControlDTO.setOperationRecordNum(operationRecordDo);
+            medQualityControlDTO.setOperationRecordStr(operationRecordDo+"%");
 
         };
         return medQualityControlDTO;
@@ -2624,7 +2624,9 @@ public class ConsoleFacade {
                  .isNotNull("start_date")
                  .isNotNull("end_date")
                  .ge("start_date",timeVo.getStartDate())
-                 .le("end_date",timeVo.getEndDate());
+                 .le("end_date",timeVo.getEndDate())
+                 .select("position_id","work_person");
+
 
          List<MedManagementInfo> list = medManagementInfoService.list(query);
          //单位时间同期门诊病案管理人员实际工作总月数  Double  =
@@ -2689,9 +2691,7 @@ public class ConsoleFacade {
        cal2.set(Calendar.DATE, 1);
        cal2.roll(Calendar.DATE, -1);
        String startTime = myFormatter.format(cal1.getTime());
-       startTime = startTime+" 00:00:00";
        String endTime = myFormatter.format(cal2.getTime());
-       endTime = endTime+" 23:59:59";
        filterVO.setStartDate(startTime);
        filterVO.setEndDate(endTime);
    };

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

@@ -844,14 +844,4 @@ public class ConsoleController {
         return RespDTO.onSuc(consoleFacade.getMedicalCheckTitle());
     }
 
-    @ApiOperation(value = " 病案管理指标（内页）[by:cy]",
-            notes = "startDate：单位开始时间<br>" +
-                    "endDate：单位结束时间<br>")
-    @PostMapping("/getMedManageIndex")
-    @SysLogger("getMedManageIndex")
-    public RespDTO<MedQualityControlDTO> getMedManageIndex(@RequestBody FilterVO filterVO) {
-        MedQualityControlDTO data = consoleFacade.getMedManageIndex(filterVO);
-        return RespDTO.onSuc(data);
-    }
-
 }

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -721,7 +721,6 @@
         f2.secWorkNum,
         f3.thrWorkNum,
         f3.forWorkNum,
-        f3.fivWorkNum,
         f3.sixWorkNum
         from (
         SELECT  count(*)  as firWorkNum
@@ -759,23 +758,17 @@
         and m.is_placefile = 0 then m.behospital_code else null end) as thrWorkNum,
         count(case when  <![CDATA[m.leave_hospital_date >= #{startDate}]]>  and  <![CDATA[m.leave_hospital_date <= #{endDate}]]>  and m.is_placefile = 1 then m.behospital_code else null end) as forWorkNum,
         count(case when  <![CDATA[m.behospital_date >= #{startDate}]]> and <![CDATA[m.leave_hospital_date <= #{endDate}]]>
-        and m.is_placefile = 1 then m.behospital_code else null end) as fivWorkNum,
-        count(case when  <![CDATA[m.behospital_date >= #{startDate}]]> and <![CDATA[m.leave_hospital_date <= #{endDate}]]>
         and m.is_placefile = 1 and m.level = '甲' then m.behospital_code else null end) as sixWorkNum
            from(
            SELECT DISTINCT a.*,b.level
             FROM
             med_behospital_info a,
-            med_qcresult_info b,
-            med_qcresult_detail c
+            med_qcresult_info b
             WHERE
             a.is_deleted = 'N'
             AND b.is_deleted = 'N'
-            AND c.is_deleted = 'N'
             AND a.hospital_id = b.hospital_id
-            AND a.hospital_id = c.hospital_id
             AND a.behospital_code = b.behospital_code
-            AND a.behospital_code = c.behospital_code
             <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
@@ -791,7 +784,7 @@
         f2.rep_name as repName,
         </if>
         f3.da_item_name as daItemName,
-        f3.da_frequency as da_frequency,
+        f3.da_status AS daStatus,
         f3.doctor_advice_type as doctorAdviceType
         from(
         SELECT DISTINCT
@@ -815,12 +808,12 @@
             AND a.hospital_id = #{hospitalId}
         </if>)f1
         <if test="flagStr != null and flagStr == 1 ">
-            left join med_lis_info f2
+             join med_lis_info f2
             on  f2.is_deleted = 'N'
             AND f1.hospitalId = f2.hospital_id
             AND f1.behospitalCode = f2.behospital_code
         </if>
-         left join  med_doctor_advice f3
+            join  med_doctor_advice f3
         on  f3.is_deleted = 'N'
         AND f1.hospitalId = f3.hospital_id
         AND f1.behospitalCode = f3.behospital_code