From 90d8b4f8e0e09f32e6cfc2fb52aeeb523d0522fd Mon Sep 17 00:00:00 2001
From: hujl <hujl@126.com>
Date: Wed, 19 Jan 2022 14:22:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BC=BA=E9=99=B7=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8:=E6=AC=A1=E6=95=B0=E6=B2=A1=E6=9C=89=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A40,=E6=97=A0=E6=89=A3=E8=B4=B9=E9=BB=98=E8=AE=A40?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/emr/controller/faultController.java  | 15 +++++++++++++--
 .../service/ipml/Emr_Fault_DetailServiceImpl.java |  6 ------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/emr/controller/faultController.java b/src/main/java/com/emr/controller/faultController.java
index e597af36..8ac93657 100644
--- a/src/main/java/com/emr/controller/faultController.java
+++ b/src/main/java/com/emr/controller/faultController.java
@@ -79,6 +79,13 @@ public class faultController {
                 if(masterList!=null && masterList.size()>0){
                     //缺陷列表
                     for (Emr_Fault_Vo faultInfo : list) {
+                        faultInfo.setBackFee("0");
+                        faultInfo.setBackNum("0");
+                        faultInfo.setUpdater(null);
+                        faultInfo.setUpdateTime(null);
+                        faultInfo.setContent(null);
+                        faultInfo.setTotalBackNum("0");
+                        faultInfo.setTotalBackFee("0");
                         //退回总次数、总费用和总评分
                         for (Emr_Fault_Vo masertInfo : masterList) {
                             if(faultInfo.getArchiveDetailId().equals(masertInfo.getArchiveDetailId())) {
@@ -93,9 +100,9 @@ public class faultController {
                                 faultInfo.setTotalBackNum(masertInfo.getTotalBackNum());
                                 faultInfo.setTotalBackFee(masertInfo.getTotalBackFee());
                             }
-                            //else{
+                            /*else{
                                 //匹配不到退回相关的ArchiveDetailId
-                            //}
+                           }*/
                         }
                         //获取病案退回是第几次 updater为退回人
                         for (Emr_Fault_Vo backInfo : backList) {
@@ -130,7 +137,11 @@ public class faultController {
                                             faultInfo.setContent(backInfo.getContent());
                                         }
                                     }
+                                    /*else{
+                                        faultInfo.setBackFee("0");
+                                    }*/
                                 }
+
                             }
                         }
                     }
diff --git a/src/main/java/com/emr/service/ipml/Emr_Fault_DetailServiceImpl.java b/src/main/java/com/emr/service/ipml/Emr_Fault_DetailServiceImpl.java
index f0072c47..b4ac34ab 100644
--- a/src/main/java/com/emr/service/ipml/Emr_Fault_DetailServiceImpl.java
+++ b/src/main/java/com/emr/service/ipml/Emr_Fault_DetailServiceImpl.java
@@ -387,12 +387,6 @@ public class Emr_Fault_DetailServiceImpl implements Emr_Fault_DetailService {
                             return temp.getString("userName");
                         }});
                     for (Emr_Fault_Vo emr_fault_vo : list) {
-                        /*JSONObject userInfo = mappedMovies.get(emr_fault_vo.getDoctorInCharge());
-                        if (userInfo==null){
-                            emr_fault_vo.setDoctorInCharge(emr_fault_vo.getDoctorInCharge());
-                        }else {
-                            emr_fault_vo.setDoctorInCharge(userInfo.getString("name"));
-                        }*/
 
                         JSONObject userInfo = mappedMovies.get(emr_fault_vo.getCreater());
                         if (userInfo==null){