Commit c1e5c6fad15c5319daa547d0bbeed49dc205a05d

Authored by liquanyu
1 parent ca9c6d68a6

update

Showing 2 changed files with 9 additions and 13 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostkfFaccade.java View file @ c1e5c6f
... ... @@ -231,8 +231,13 @@
231 231 {
232 232 MaternalDeliverModel maternalDeliverModel = list2.get(0);
233 233 info.put("fmDate",maternalDeliverModel.getDueDate());
234   - info.put("fmDoctor", usersService.getUsers(Integer.parseInt(maternalDeliverModel.getDeliverDoctor())).getName());
235   -
  234 + try {
  235 + info.put("fmDoctor", usersService.getUsers(Integer.parseInt(maternalDeliverModel.getDeliverDoctor())).getName());
  236 + }
  237 + catch (Exception e)
  238 + {
  239 + info.put("fmDoctor", maternalDeliverModel.getDeliverDoctor());
  240 + }
236 241 Patients patients = patientsService.findOnePatientById(maternalDeliverModel.getParentId());
237 242 if (patients != null)
238 243 {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ c1e5c6f
... ... @@ -6,16 +6,7 @@
6 6 import java.io.InputStreamReader;
7 7 import java.math.RoundingMode;
8 8 import java.text.SimpleDateFormat;
9   -import java.util.ArrayList;
10   -import java.util.Calendar;
11   -import java.util.Date;
12   -import java.util.HashMap;
13   -import java.util.HashSet;
14   -import java.util.Iterator;
15   -import java.util.LinkedHashMap;
16   -import java.util.List;
17   -import java.util.Map;
18   -import java.util.Set;
  9 +import java.util.*;
19 10  
20 11 import com.lyms.hospitalapi.qhdfy.QhdfyHisService;
21 12 import com.lyms.platform.common.constants.*;
... ... @@ -8225,7 +8216,7 @@
8225 8216 babyCheckModel.setBuildId(id);
8226 8217 babyCheckModel.setYn(YnEnums.YES.getId());
8227 8218 babyCheckModel.setSort("created asc");
8228   - List <BabyCheckListResult> checkListResults = new ArrayList <>();
  8219 + List <BabyCheckListResult> checkListResults = new LinkedList<>();
8229 8220 List <BabyCheckModel> babyCheckList = babyCheckService.queryBabyCheckListRecord(babyCheckModel);
8230 8221 if (CollectionUtils.isNotEmpty(babyCheckList)) {
8231 8222 for (BabyCheckModel babyCheck : babyCheckList) {