Bläddra i källkod

核查任务列表缺陷数排序修改

rengb 4 år sedan
förälder
incheckning
f12da42a98

+ 0 - 7
src/main/java/com/diagbot/facade/RecordCheckFacade.java

@@ -6,7 +6,6 @@ import com.diagbot.dto.BehospitalInfoAgeDTO;
 import com.diagbot.dto.CheckedRecordListDTO;
 import com.diagbot.dto.SysUserDeptDTO;
 import com.diagbot.entity.MedCheckInfo;
-import com.diagbot.entity.MedQcresultDetail;
 import com.diagbot.entity.SysUserDept;
 import com.diagbot.entity.SysUserRole;
 import com.diagbot.enums.CheckJobTypeEnum;
@@ -91,14 +90,8 @@ public class RecordCheckFacade {
 
         if (ListUtil.isNotEmpty(iPage.getRecords())) {
             List<String> behospitalCodes = iPage.getRecords().stream().map(i -> i.getBehospitalCode()).collect(Collectors.toList());
-            QueryWrapper<MedQcresultDetail> medQcresultDetailQueryWrapper = new QueryWrapper<>();
-            medQcresultDetailQueryWrapper.eq("hospital_id", hospitalId);
-            medQcresultDetailQueryWrapper.in("behospital_code", behospitalCodes);
-            medQcresultDetailQueryWrapper.select("behospital_code", "cases_entry_id");
-            Map<String, Long> behospitalCodeCasesMap = medQcresultDetailService.list(medQcresultDetailQueryWrapper).stream().collect(Collectors.groupingBy(MedQcresultDetail::getBehospitalCode, Collectors.counting()));
             Map<String, BehospitalInfoAgeDTO> ageMap = behospitalInfoFacade.getBehospitalInfoAge(hospitalId, behospitalCodes).stream().collect(Collectors.toMap(i -> i.getBehospitalCode(), i -> i));
             iPage.getRecords().forEach(i -> {
-                i.setCasesEntryNum(behospitalCodeCasesMap.get(i.getBehospitalCode()) == null ? 0 : behospitalCodeCasesMap.get(i.getBehospitalCode()).intValue());
                 i.setMonth(i.getJobDistributionTime());
                 i.setStatus(CheckStatusEnum.getName(Integer.parseInt(i.getStatus())));
                 i.setAge(ageMap.get(i.getBehospitalCode()) == null ? "" : ageMap.get(i.getBehospitalCode()).getAge());

+ 3 - 2
src/main/resources/mapper/MedCheckInfoMapper.xml

@@ -334,7 +334,7 @@
     </update>
 
     <select id="checkedRecordList" resultType="com.diagbot.dto.CheckedRecordListDTO">
-        SELECT *
+        SELECT t1.*,SUM(if(t2.behospital_code is null,0,1)) as casesEntryNum
         from
         (select
         b.behospital_code as behospitalCode,
@@ -398,8 +398,9 @@
                 #{checkJobType}
             </foreach>
         </if>
-        ) tab
+        ) t1 left join med_qcresult_detail t2 on t1.behospitalCode=t2.behospital_code and t2.hospital_id=#{hospitalId} and t2.is_deleted='N'
         where isDel>0
+        group by t1.behospitalCode
     </select>
 
 </mapper>