Merge remote-tracking branch 'origin/master'

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

@@ -1,9 +1,10 @@
 package com.diagbot.dto;
 
-import io.swagger.models.auth.In;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
+
 /**
  * @author wangfeng
  * @Description:
@@ -12,22 +13,24 @@ import lombok.Setter;
 @Setter
 @Getter
 public class QcCasesEntryFindDTO {
+    //医院id
+    private Long hospitalId;
     //模块id
     private Long casesId;
     //模块名
     private String casesName;
+    //模块分值
+    private BigDecimal CaseScore;
     //医院模块id
     private Long modeId;
     //条目id
     private Long casesEntryId;
-    //医院id
-    private Long hospitalId;
     //条目名
     private String entryName;
     //提示信息
-    private String msg ;
-    //分值
-    private Double score;
+    private String msg;
+    //条目分值
+    private BigDecimal score;
     //是否单项否决
     private Integer isReject;
 }

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

@@ -31,8 +31,6 @@ import java.util.List;
  */
 @Component
 public class QcCasesEntryHospitalFacade extends QcCasesEntryHospitalServiceImpl {
-    @Autowired
-    QcCasesEntryHospitalService qcCasesEntryHospitalService;
     @Autowired
     private QcCasesFacade qcCasesFacade;
 
@@ -42,7 +40,7 @@ public class QcCasesEntryHospitalFacade extends QcCasesEntryHospitalServiceImpl
      * @return
      */
     public IPage<List<QcCasesEntryHospitalDTO>> QcCasesEntryHospitals(QcCasesEntryHospitalVO qcCasesEntryHospitalVO) {
-        IPage<List<QcCasesEntryHospitalDTO>> data = qcCasesEntryHospitalService.getQcCasesEntryAlls(qcCasesEntryHospitalVO);
+        IPage<List<QcCasesEntryHospitalDTO>> data = this.getQcCasesEntryAlls(qcCasesEntryHospitalVO);
         return data;
     }
 
@@ -92,7 +90,7 @@ public class QcCasesEntryHospitalFacade extends QcCasesEntryHospitalServiceImpl
      * @return
      */
     public List<QcCasesEntryFindDTO> findQcCasesEntryAlls(QcCasesEntryFindVO qcCasesEntryFindVO) {
-        List<QcCasesEntryFindDTO> data = qcCasesEntryHospitalService.findQcCasesEntryAll(qcCasesEntryFindVO);
+        List<QcCasesEntryFindDTO> data = this.findQcCasesEntryAll(qcCasesEntryFindVO);
         return data;
     }
 }

src/main/resources/mapper/QcCasesEntryHospitalMapper.xml

@@ -59,17 +59,23 @@
         b.mode_id AS modeId,
         b.id AS casesEntryId,
         a.hospital_id AS hospitalId,
-        b.name AS entryName,
-        a.msg AS msg ,
-        a.score as score,
-        a.is_reject as isReject
+        b. NAME AS entryName,
+        a.msg AS msg,
+        a.score AS score,
+        a.is_reject AS isReject,
+        c.score AS caseScore
         FROM
-        qc_cases_entry_hospital a
-        JOIN qc_cases_entry b
-        ON a.cases_entry_id = b.id
-        WHERE a.is_deleted = "N"
+        qc_cases_entry_hospital a,
+        qc_cases_entry b,
+        qc_cases_hospital c
+        WHERE
+        a.is_deleted = "N"
         AND b.is_deleted = "N"
-        AND a.is_used =1
+        AND c.is_deleted = "N"
+        AND a.cases_entry_id = b.id
+        AND c.cases_id = b.cases_id
+        AND c.hospital_id = a.hospital_id
+        AND a.is_used = 1
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
         </if>