jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 8bf8fe48ee89fc9d6271ee9621c7b041cbb6842d

Authored by jiangjiazhi
2 parents 95635243bd c455302e64
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 11 changed files

platform-common/src/main/java/com/lyms/platform/common/enums/BloodSugarEnums.java View file @ 8bf8fe4
... ... @@ -5,7 +5,7 @@
5 5 */
6 6 public enum BloodSugarEnums {
7 7  
8   - A(1, "空腹"), B(2, "早餐前"), C(3, "早餐后2h"), D(4, "午餐前"), E(5, "午餐后2h"), F(6, "晚餐前"), G(7, "晚餐后2h"), H(8, "夜间"), I(9, "睡前");
  8 + A(1, "空腹"), B(2, "早餐前"), C(3, "早餐后2h"), D(4, "午餐前"), E(5, "午餐后2h"), F(6, "晚餐前"), G(7, "晚餐后2h"), I(9, "睡前") ,H(8, "夜间");
9 9  
10 10 BloodSugarEnums(Integer id, String name) {
11 11 this.id = id;
platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java View file @ 8bf8fe4
... ... @@ -18,7 +18,8 @@
18 18 tz(2, "体重管理"),
19 19 xt(3, "血糖管理"),
20 20 xy(4, "血压管理"),
21   - zjzx(5, "专家咨询");
  21 + zjzx(5, "专家咨询"),
  22 + tw(6, "体温管理");
22 23 private Integer id;
23 24 private String title;
24 25  
platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/DzfyHisService.java View file @ 8bf8fe4
... ... @@ -457,12 +457,13 @@
457 457 public List<DzReplace> findAllVcCarddNo(String vcCardNo)
458 458 {
459 459 List<DzReplace> allCardNoList = new ArrayList<DzReplace>();
  460 + List<DzReplace> allNoList = new ArrayList<DzReplace>();
460 461 if (StringUtils.isNotBlank(vcCardNo))
461 462 {
462 463 System.out.println("vcCardNo = " + vcCardNo);
463 464 Connection conn = com.lyms.hospitalapi.dzfy.ConnTools.makeHisConnection();
464 465 QueryRunner queryRunner = new QueryRunner(true);
465   - String sql = "select id as id from zlhis.v_patientinfo where cardno = '"+vcCardNo+"'";
  466 + String sql = "select 病人ID as id from zlhis.v_cardinfo where 卡号 = '"+vcCardNo+"'";
466 467 try
467 468 {
468 469 List<DzReplace> hisDzReplaceList = queryRunner.query(conn,sql,new BeanListHandler<DzReplace>(DzReplace.class));
... ... @@ -470,6 +471,9 @@
470 471 {
471 472 String jzkSql = "select 病人ID as id,卡号 as cardNo,登记时间 as combTime from zlhis.jzkghjl where 病人ID = '"+hisDzReplaceList.get(0).getId()+"'";
472 473 allCardNoList = queryRunner.query(conn,jzkSql,new BeanListHandler<DzReplace>(DzReplace.class));
  474 + String noSql = "select 病人ID as id,卡号 as cardNo from zlhis.v_cardinfo where 病人ID = '"+hisDzReplaceList.get(0).getId()+"'";
  475 + allNoList = queryRunner.query(conn,noSql,new BeanListHandler<DzReplace>(DzReplace.class));
  476 + allCardNoList.addAll(allNoList);
473 477 System.out.println("vcCardNo list " + allCardNoList);
474 478 }
475 479 }
platform-operate-api/src/main/java/com/lyms/hospitalapi/lcdcf/LcdcfHisService.java View file @ 8bf8fe4
... ... @@ -50,27 +50,51 @@
50 50 * @param vcCardNo
51 51 * @return
52 52 */
53   - public List<HisCheckItems> getPatientCheckLisItems(String vcCardNo)
  53 + public String getPatientCheckLisItems(String vcCardNo)
54 54 {
55 55 String time = DateUtil.getyyyy_MM_dd(new Date());
56 56 Connection connection = null;
57 57 try {
58   - String sql = "select ID as id,就诊卡号 as vcCardNo,医嘱内容 as content,开嘱时间 as time,诊疗项目ID as itemId from v_check_items where 就诊卡号='"+vcCardNo+"' and 开嘱时间 like '"+time+"%'";
59   - connection = ConnTools.makeHisConnection();
60   - QueryRunner queryRunner = new QueryRunner(true);
61   - List<HisCheckItems> hisCheckItems = queryRunner.query(connection,sql,new BeanListHandler<HisCheckItems>(HisCheckItems.class));
  58 +// String sql = "select ID as id,就诊卡号 as vcCardNo,医嘱内容 as content,开嘱时间 as time,诊疗项目ID as itemId from v_check_items where 就诊卡号='"+vcCardNo+"' and 开嘱时间 like '"+time+"%'";
  59 +// connection = ConnTools.makeHisConnection();
  60 +// QueryRunner queryRunner = new QueryRunner(true);
  61 +// List<HisCheckItems> hisCheckItems = queryRunner.query(connection,sql,new BeanListHandler<HisCheckItems>(HisCheckItems.class));
  62 +
  63 + List<HisCheckItems> hisCheckItems = new ArrayList<>();
  64 + HisCheckItems item1 = new HisCheckItems();
  65 + item1.setContent("血常规检查");
  66 + hisCheckItems.add(item1);
  67 + HisCheckItems item2 = new HisCheckItems();
  68 + item2.setContent("尿常规检查");
  69 + hisCheckItems.add(item2);
  70 +
  71 +
  72 + StringBuffer sb = new StringBuffer();
62 73 if(CollectionUtils.isNotEmpty(hisCheckItems))
63 74 {
64   - return hisCheckItems;
  75 + for (int i = 0 ; i < hisCheckItems.size() ; i++)
  76 + {
  77 + HisCheckItems item = hisCheckItems.get(0);
  78 + if (i != (hisCheckItems.size() - 1))
  79 + {
  80 + sb.append(item.getContent());
  81 + sb.append(",");
  82 + }
  83 + else
  84 + {
  85 + sb.append(item.getContent());
  86 + }
  87 + }
  88 + return sb.toString();
65 89 }
66   - } catch (SQLException e) {
  90 + } catch (Exception e) {
67 91 e.printStackTrace();
68 92 }
69 93 finally
70 94 {
71 95 DbUtils.closeQuietly(connection);
72 96 }
73   - return null;
  97 + return "";
74 98 }
75 99  
76 100 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java View file @ 8bf8fe4
... ... @@ -33,9 +33,10 @@
33 33 * 聊城曲线图
34 34 */
35 35 @ResponseBody
  36 + @TokenRequired
36 37 @RequestMapping(value = "/health/{parentId}", method = RequestMethod.GET)
37   - public BaseObjectResponse health(@PathVariable String parentId) {
38   - return reportService.health(parentId);
  38 + public BaseObjectResponse health(@PathVariable String parentId, HttpServletRequest request) {
  39 + return reportService.health(parentId, getUserId(request));
39 40 }
40 41  
41 42 /**
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java View file @ 8bf8fe4
... ... @@ -41,8 +41,8 @@
41 41 static
42 42 {
43 43 HighLevelMap.put("绿色预警", "低风险");
44   - HighLevelMap.put("橙色预警", "一般风险");
45   - HighLevelMap.put("黄色预警", "较高风险");
  44 + HighLevelMap.put("黄色预警", "一般风险");
  45 + HighLevelMap.put("橙色预警", "较高风险");
46 46 HighLevelMap.put("红色预警", "高风险");
47 47 HighLevelMap.put("紫色预警", "传染病");
48 48 }
49 49  
... ... @@ -62,7 +62,10 @@
62 62 @Autowired
63 63 private BasicConfigService basicConfigService;
64 64  
  65 + @Autowired
  66 + private AccessPermissionFacade accessPermissionFacade;
65 67  
  68 +
66 69 @Autowired
67 70 private AutoMatchFacade autoMatchFacade;
68 71  
69 72  
... ... @@ -260,9 +263,11 @@
260 263 times = DateUtil.getRange(DateUtil.parseYMD(countRequest.getTimeStart()),
261 264 DateUtil.parseYMD(countRequest.getTimeEnd()));
262 265 }
263   -
  266 + BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
  267 + basicConfigQuery.setParentId(SystemConfig.HIGH_RISK_ID);
  268 + basicConfigQuery.setYn(YnEnums.YES.getId());
264 269 //查询高危分类
265   - List<BasicConfig> riskLevelConfig = basicConfigService.queryByParentId(SystemConfig.HIGH_RISK_ID);
  270 + List<BasicConfig> riskLevelConfig = basicConfigService.queryBasicConfig(basicConfigQuery);
266 271  
267 272 Map<String,Object> datas = new HashMap<>();
268 273  
269 274  
270 275  
271 276  
272 277  
273 278  
... ... @@ -272,31 +277,30 @@
272 277 basicQuery.setYn(YnEnums.YES.getId());
273 278 basicQuery.setTypeId("b7ea005c-dfac-4c2a-bdae-25239b3f44fd");
274 279  
  280 + List<DataPermissionsModel> permissionsModelList = accessPermissionFacade.findAccessPerminssionByUserId(userId);
275 281  
276   - String parentId = "";
  282 + String permission = permissionsModelList.get(0).getAreaPermission();
  283 + System.out.println("permission======" + permission);
  284 +
277 285 if (StringUtils.isNotEmpty(countRequest.getProvinceId()))
278 286 {
279 287 basicQuery.setParentId(countRequest.getProvinceId());
280 288 countRequest.setExportType(1);
281   - parentId = countRequest.getProvinceId();
282 289 }
283 290  
284 291 if (StringUtils.isNotEmpty(countRequest.getCityId()))
285 292 {
286 293 basicQuery.setParentId(countRequest.getCityId());
287 294 countRequest.setExportType(2);
288   - parentId = countRequest.getCityId();
289 295 }
290 296  
291   - //获取地址列表
292   - List<Map<String, Object>> list = mongoUtil.getChilds(parentId,null);
293   -
294 297 if (StringUtils.isNotEmpty(countRequest.getAreaId()))
295 298 {
296 299 basicQuery.setParentId(countRequest.getAreaId());
297 300 countRequest.setExportType(3);
298 301 }
299 302  
  303 +
300 304 int addrType = countRequest.getExportType();
301 305 List<String> title = getTableDataTitle(addrType,times);
302 306  
... ... @@ -306,6 +310,34 @@
306 310 List<String> addrId = new ArrayList<>();
307 311  
308 312  
  313 + //权限的id
  314 + List<String> childsId = new ArrayList<>();
  315 +
  316 + if (StringUtils.isNotEmpty(permission)) {
  317 + List<Map> permissions = JsonUtil.toList(permission, Map.class);
  318 + if (CollectionUtils.isNotEmpty(permissions))
  319 + {
  320 + for (Map map : permissions)
  321 + {
  322 + if (addrType == 1)
  323 + {
  324 + String c = String.valueOf(map.get("c"));
  325 + childsId.add(c);
  326 + }
  327 + else if (addrType == 2)
  328 + {
  329 + String a = String.valueOf(map.get("a"));
  330 + childsId.add(a);
  331 + }
  332 +
  333 + }
  334 + }
  335 + }
  336 + basicQuery.setIds(childsId);
  337 +
  338 + //获取地址列表
  339 + List<BasicConfig> configList = basicConfigService.queryBasicConfig(basicQuery);
  340 +
309 341 //序列号
310 342 int seq = 0;
311 343  
... ... @@ -315,7 +347,7 @@
315 347 //统计城市和区县表格数据
316 348 if (addrType < 3)
317 349 {
318   - List<BasicConfig> configList = basicConfigService.queryBasicConfig(basicQuery);
  350 +
319 351 OrganizationQuery query = new OrganizationQuery();
320 352 query.setYn(YnEnums.YES.getId());
321 353 if (CollectionUtils.isNotEmpty(configList))
322 354  
323 355  
324 356  
... ... @@ -535,15 +567,15 @@
535 567  
536 568 if (addrType < 3)
537 569 {
538   - if (CollectionUtils.isNotEmpty(list))
  570 + if (CollectionUtils.isNotEmpty(configList))
539 571 {
540   - for (Map<String, Object> addr : list)
  572 + for (BasicConfig addr : configList)
541 573 {
542   - if (addrId.contains(String.valueOf(addr.get("id")) + String.valueOf(addr.get("name"))))
  574 + if (addrId.contains(addr.getId() + addr.getName()))
543 575 {
544 576 continue;
545 577 }
546   - xAxis.add(String.valueOf(addr.get("name")));
  578 + xAxis.add(addr.getName());
547 579 }
548 580 for (BasicConfig config : riskLevelConfig)
549 581 {
550 582  
551 583  
... ... @@ -556,14 +588,14 @@
556 588  
557 589 List<String> items = new ArrayList<>();
558 590  
559   - for (Map<String, Object> addr : list)
  591 + for (BasicConfig addr : configList)
560 592 {
561   - if (addrId.contains(String.valueOf(addr.get("id")) + String.valueOf(addr.get("name"))))
  593 + if (addrId.contains(addr.getId() + addr.getName()))
562 594 {
563 595 continue;
564 596 }
565 597  
566   - String id = String.valueOf(addr.get("id"));
  598 + String id = addr.getId();
567 599 if (addrType == 1)
568 600 {
569 601 idQuery.setCityId(id);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IReportService.java View file @ 8bf8fe4
... ... @@ -104,6 +104,6 @@
104 104  
105 105 void patientsExport2(String provinceId, String cityId, String areaId, String streetId, Integer ageType, Integer patientType, Date startDate, Date endDate, Integer userId, HttpServletResponse response);
106 106  
107   - BaseObjectResponse health(String parentId);
  107 + BaseObjectResponse health(String parentId, Integer userId);
108 108 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java View file @ 8bf8fe4
... ... @@ -29,7 +29,9 @@
29 29 import org.apache.http.util.EntityUtils;
30 30 import org.joda.time.DateTime;
31 31 import org.springframework.beans.factory.annotation.Autowired;
  32 +import org.springframework.beans.factory.annotation.Qualifier;
32 33 import org.springframework.data.domain.Sort;
  34 +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
33 35 import org.springframework.stereotype.Service;
34 36  
35 37 import javax.print.attribute.standard.DateTimeAtCompleted;
... ... @@ -92,6 +94,10 @@
92 94 @Autowired
93 95 private AntenatalExaminationService antenatalExaminationService;
94 96  
  97 + @Autowired
  98 + @Qualifier("commonThreadPool")
  99 + private ThreadPoolTaskExecutor commonThreadPool;
  100 +
95 101 /**
96 102 * 该方法是区域或者单体医院部署的把数据定时往某个环境上传
97 103 * （如往线上环境上传，mongo_sync_url就配置相应的线上的接收地址）
... ... @@ -176,7 +182,7 @@
176 182 end = list.size();
177 183 }
178 184 final List<SyncDataModel> tempList = list.subList(i, end);
179   - new Thread(new Runnable() {
  185 + commonThreadPool.execute(new Runnable() {
180 186 @Override
181 187 public void run() {
182 188 if (CollectionUtils.isNotEmpty(tempList))
... ... @@ -196,7 +202,7 @@
196 202 }
197 203 }
198 204 }
199   - }).start();
  205 + });
200 206 }
201 207 }
202 208 }catch(Exception ex){
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java View file @ 8bf8fe4
... ... @@ -226,22 +226,101 @@
226 226 @Override
227 227 public BaseResponse wxInfo(String parentId, Integer type) {
228 228 List<Map<String, Object>> restList = new ArrayList<>();
229   - List<BloodSugar> bloodSugars = mongoTemplate.find(Query.query(Criteria.where("parentId").is(parentId).and("bloodSugarType").is(type)).with(new Sort(Sort.Direction.DESC, "created")), BloodSugar.class);
  229 + List<BloodSugar> bloodSugars = mongoTemplate.find(Query.query(Criteria.where("parentId").is(parentId)).with(new Sort(Sort.Direction.DESC, "created")), BloodSugar.class);
230 230 Set<String> dayCountSet = new HashSet<>();
231 231 Set<String> monthCountSet = new HashSet<>();
232 232 for (BloodSugar bloodSugar : bloodSugars) {
  233 + monthCountSet.add(DateUtil.getMonth(bloodSugar.getCreated())+"");
  234 + dayCountSet.add(DateUtil.getyyyy_MM_dd(bloodSugar.getCreated()));
  235 +
233 236 if(bloodSugar.getBloodSugarType() == type) {
234 237 Map<String, Object> temp = new HashMap<>();
235 238 temp.put("bloodSugar", bloodSugar.getBloodSugar());
236 239 temp.put("craeted", DateUtil.getyyyy_MM_dd_hms(bloodSugar.getCreated()));
237   - monthCountSet.add(DateUtil.getMonth(bloodSugar.getCreated())+"");
238 240 temp.put("type", bloodSugar.getBloodSugarType());
239 241 restList.add(temp);
  242 + }
  243 + }
240 244  
241   - dayCountSet.add(DateUtil.getyyyy_MM_dd(bloodSugar.getCreated()));
  245 +
  246 + // 周平均
  247 + Date date = new Date();
  248 + List<Map<String, Object>> weekAvgMap = new ArrayList<>();
  249 + Map<Integer, Map<String, Object>> weekAvgMapTemp = new LinkedHashMap<>();
  250 + Date weekStart = DateUtil.addWeek(date, -1);
  251 + List<BloodSugar> bloodSugarsWeek = mongoTemplate.find(Query.query(Criteria.where("parentId").is(parentId).and("created").gte(weekStart)).with(new Sort(Sort.Direction.DESC, "created")), BloodSugar.class);
  252 + for (BloodSugar bloodSugar : bloodSugarsWeek) {
  253 + if(weekAvgMapTemp.containsKey(bloodSugar.getBloodSugarType())) {
  254 + Map<String, Object> temp = weekAvgMapTemp.get(bloodSugar.getBloodSugarType());
  255 + temp.put("dayCount", Integer.parseInt(temp.get("dayCount") + "") + 1); // 总共有记录的天数
  256 + temp.put("sugarCount", Double.parseDouble(temp.get("sugarCount") + "") + Double.parseDouble(bloodSugar.getBloodSugar())); // 总共所有记录的和
  257 + weekAvgMapTemp.put(bloodSugar.getBloodSugarType(), temp);
  258 + } else {
  259 + Map<String, Object> temp = new HashMap<>();
  260 + temp.put("dayCount", 1); // 总共有记录的天数
  261 + temp.put("sugarCount", Double.parseDouble(bloodSugar.getBloodSugar())); // 总共所有记录的和
  262 + weekAvgMapTemp.put(bloodSugar.getBloodSugarType(), temp);
242 263 }
243 264 }
244   - return RespBuilder.buildSuccess("restList", restList, "count", bloodSugars.size(), "dayCount", dayCountSet.size(), "month", monthCountSet);
  265 + for (BloodSugarEnums bloodSugarEnums : BloodSugarEnums.values()) {
  266 + Map<String, Object> weekMap = new HashMap<>();
  267 + weekMap.put("name", bloodSugarEnums.getName());
  268 + boolean flag = true;
  269 + for (Map.Entry<Integer, Map<String, Object>> entry : weekAvgMapTemp.entrySet()) {
  270 + if(entry.getKey() == bloodSugarEnums.getId()) {
  271 + Map<String, Object> map = entry.getValue();
  272 + Integer dayCount = (Integer) map.get("dayCount");
  273 + Double sugarCount = (Double) map.get("sugarCount");
  274 + weekMap.put("value", sugarCount / dayCount + "");
  275 + flag = false;
  276 + }
  277 + }
  278 + if(flag) {
  279 + weekMap.put("value", "--");
  280 + }
  281 + weekAvgMap.add(weekMap);
  282 + }
  283 +
  284 + // 月平均
  285 + List<Map<String, Object>> monthAvgMap = new ArrayList<>();
  286 + Map<Integer, Map<String, Object>> monthAvgTemp = new LinkedHashMap<>();
  287 + Date monthStart = DateUtil.addMonth(date, -1);
  288 + List<BloodSugar> bloodSugarsMonth = mongoTemplate.find(Query.query(Criteria.where("parentId").is(parentId).and("created").gte(monthStart)).with(new Sort(Sort.Direction.DESC, "created")), BloodSugar.class);
  289 + for (BloodSugar bloodSugar : bloodSugarsMonth) {
  290 + if(monthAvgTemp.containsKey(bloodSugar.getBloodSugarType())) {
  291 + Map<String, Object> temp = monthAvgTemp.get(bloodSugar.getBloodSugarType());
  292 + temp.put("dayCount", Integer.parseInt(temp.get("dayCount") + "") + 1); // 总共有记录的天数
  293 + temp.put("sugarCount", Double.parseDouble(temp.get("sugarCount") + "") + Double.parseDouble(bloodSugar.getBloodSugar())); // 总共所有记录的和
  294 + monthAvgTemp.put(bloodSugar.getBloodSugarType(), temp);
  295 + } else {
  296 + Map<String, Object> temp = new HashMap<>();
  297 + temp.put("dayCount", 1); // 总共有记录的天数
  298 + temp.put("sugarCount", Double.parseDouble(bloodSugar.getBloodSugar())); // 总共所有记录的和
  299 + monthAvgTemp.put(bloodSugar.getBloodSugarType(), temp);
  300 + }
  301 + }
  302 + for (BloodSugarEnums bloodSugarEnums : BloodSugarEnums.values()) {
  303 + Map<String, Object> monthMap = new HashMap<>();
  304 + monthMap.put("name", bloodSugarEnums.getName());
  305 + boolean flag = true;
  306 + for (Map.Entry<Integer, Map<String, Object>> entry : monthAvgTemp.entrySet()) {
  307 + monthMap.put("name", bloodSugarEnums.getName());
  308 + if(entry.getKey() == bloodSugarEnums.getId()) {
  309 + Map<String, Object> map = entry.getValue();
  310 + Integer dayCount = (Integer) map.get("dayCount");
  311 + Double sugarCount = (Double) map.get("sugarCount");
  312 + monthMap.put("value", sugarCount / dayCount + "");
  313 + flag = false;
  314 + }
  315 + }
  316 + if(flag) {
  317 + monthMap.put("value", "--");
  318 + }
  319 + monthAvgMap.add(monthMap);
  320 + }
  321 +
  322 +
  323 + return RespBuilder.buildSuccess("restList", restList, "count", bloodSugars.size(), "dayCount", dayCountSet.size(), "month", monthCountSet, "monthAvgMap", monthAvgMap, "weekAvgMap", weekAvgMap);
245 324 }
246 325  
247 326 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java View file @ 8bf8fe4
... ... @@ -593,14 +593,13 @@
593 593 }
594 594  
595 595 @Override
596   - public BaseObjectResponse health(String parentId) {
  596 + public BaseObjectResponse health(String parentId, Integer userId) {
  597 + String hospitalId = autoMatchFacade.getHospitalId(userId);
597 598 List<Map<String, Object>> restList = new ArrayList<>();
598 599 Patients p = mongoTemplate.findById(parentId, Patients.class);
599   - AntExChuModel antExChuModel = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(parentId).and("yn").is(1).and("hospitalId").is("216")).with(new Sort(Sort.Direction.DESC, "checkTime")), AntExChuModel.class);
600   - List<AntenatalExaminationModel> antexModels = mongoTemplate.find(Query.query(Criteria.where("parentId").is(parentId).and("yn").is(1)).with(new Sort(Sort.Direction.DESC, "checkTime")), AntenatalExaminationModel.class);
  600 + AntExChuModel antExChuModel = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(parentId).and("yn").is(1).and("hospitalId").is(hospitalId)).with(new Sort(Sort.Direction.DESC, "checkTime")), AntExChuModel.class);
  601 + List<AntenatalExaminationModel> antexModels = mongoTemplate.find(Query.query(Criteria.where("parentId").is(parentId).and("yn").is(1).and("hospitalId").is(hospitalId)).with(new Sort(Sort.Direction.DESC, "checkTime")), AntenatalExaminationModel.class);
601 602  
602   -// antExChuModels.get()
603   -
604 603 for (AntenatalExaminationModel antexModel : antexModels) {
605 604 Map<String, Object> temp = new HashMap<>();
606 605 temp.put("checkTime", DateUtil.getyyyy_MM_dd(antexModel.getCheckDate()));
... ... @@ -666,6 +665,10 @@
666 665 temp.put("urineProtein", antExChuModel.getNdb()); // 尿蛋白
667 666 temp.put("hemoglobin", antExChuModel.getXhdb()); // 血红素
668 667 restList.add(temp);
  668 +
  669 + Map<String, Object> xtMap = new HashMap<>();
  670 + Map<String, Object> tzMap = new HashMap<>();
  671 +
669 672  
670 673  
671 674 return RespBuilder.buildSuccess(restList);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java View file @ 8bf8fe4
... ... @@ -66,13 +66,13 @@
66 66 }
67 67 }
68 68  
69   - public List<Map<String, Object>> getChilds(String parentId,String childId) {
  69 + public List<Map<String, Object>> getChilds(String parentId,List<String> childIds) {
70 70 List<Map<String, Object>> childList = new ArrayList<>();
71 71  
72 72 Criteria c = Criteria.where("parentId").is(parentId);
73   - if (StringUtils.isNotEmpty(childId))
  73 + if (org.apache.commons.collections.CollectionUtils.isNotEmpty(childIds))
74 74 {
75   - c.and("id").is(childId);
  75 + c.and("id").in(childIds);
76 76 }
77 77 c.and("typeId").is("b7ea005c-dfac-4c2a-bdae-25239b3f44fd");
78 78