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){