jiangjiazhi / regional-platform

Download as
Browse Code »

Commit faf9fac7ede3bbb0fcee51e086dcc520a4d3c6ce

Authored by yangfei
2 parents 4eebc26fe0 ea07240a43
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java

Showing 6 changed files

platform-common/src/main/java/com/lyms/platform/common/enums/SmsServiceEnums.java View file @ faf9fac
... ... @@ -48,7 +48,8 @@
48 48 YKGQTX(34,"儿童眼科过期提醒",32,"2"),
49 49 EBGQTX(35,"儿童儿保过期提醒",32,"2"),
50 50 FWDGTX(36,"服务订购提醒",18,"1"),
51   - JSGWZD(37,"及时高危指导",1,"");
  51 + JSGWZD(37,"及时高危指导",1,""),
  52 + CSJGTZ(38,"产筛结果通知",21,"1");
52 53  
53 54 private SmsServiceEnums(int id,String name,int pid,String serviceObj){
54 55 this.id = id;
platform-common/src/main/java/com/lyms/platform/common/enums/WxTempleteIdEnums.java View file @ faf9fac
... ... @@ -17,10 +17,11 @@
17 17 YUN_YI_BAN_ZHI_DAO("98i1P6zh3slBxEKLftweaESnnem4w6SDmzvJIBWRXNE","孕妇一般指导"),//孕妇
18 18 CHAN_YI_BAN_ZHI_DAO("H2_ucLqVEbsZAv-EZcmUDpD1Zul5NGqMoJktHT0u4gw","产妇一般指导"),//产妇
19 19 BABY_YI_BAN_ZHI_DAO("dqvyESU8UXx1V3cIMQDqj4PLxI6T9-sgihQcs3ZGL9E","儿童一般指导"),//儿童
20   - YUN_XUE_KE_CHEN_TX("","孕妇学校课程提醒"),//孕妇学校课程提醒
  20 + YUN_XUE_KE_CHEN_TX("UEwcdz3lJL3NR38KRqN6yTO4nUvRgym5mlXl4jXQBik","孕妇学校课程提醒"),//孕妇学校课程提醒
21 21 FU_WU_DING_GOU_TX("UEwcdz3lJL3NR38KRqN6yTO4nUvRgym5mlXl4jXQBik","服务订购提醒"),//服务订购提醒
22   - YI_SHENG_ZHI_DAO("OggqiSHitLkCgSLCaCH72reCZzaw5NyG8iO56InQiQg","医生指导");//指导
23   -// WEI_JI_ZHI_DAO("fNkkLSp_gS-YWvzji6gwgdTddl4XBlk8SNP7FRksrfk","危急值提醒");//危急值提醒
  22 + YI_SHENG_ZHI_DAO("OggqiSHitLkCgSLCaCH72reCZzaw5NyG8iO56InQiQg","医生指导"),//指导
  23 + // WEI_JI_ZHI_DAO("fNkkLSp_gS-YWvzji6gwgdTddl4XBlk8SNP7FRksrfk","危急值提醒");//危急值提醒
  24 + SHAI_CHA_TONG_ZHI("","产筛结果通知");//产筛结果通知
24 25  
25 26  
26 27  
platform-dal/src/main/java/com/lyms/platform/query/SieveApplyOrderQuery.java View file @ faf9fac
... ... @@ -20,6 +20,27 @@
20 20 private String id;
21 21 private String hospitalId;
22 22  
  23 + private String number;
  24 +
  25 + //产筛医院
  26 + private String sieveHospitalId;
  27 +
  28 + public String getNumber() {
  29 + return number;
  30 + }
  31 +
  32 + public void setNumber(String number) {
  33 + this.number = number;
  34 + }
  35 +
  36 + public String getSieveHospitalId() {
  37 + return sieveHospitalId;
  38 + }
  39 +
  40 + public void setSieveHospitalId(String sieveHospitalId) {
  41 + this.sieveHospitalId = sieveHospitalId;
  42 + }
  43 +
23 44 public String getHospitalId() {
24 45 return hospitalId;
25 46 }
... ... @@ -60,6 +81,9 @@
60 81 }
61 82 if(null!=hospitalId){
62 83 condition= condition.and("hospitalId",hospitalId, MongoOper.IS);
  84 + }
  85 + if(null!=sieveHospitalId){
  86 + condition= condition.and("sieveHospitalId",sieveHospitalId, MongoOper.IS);
63 87 }
64 88 if(null!=yn){
65 89 condition= condition.and("yn",yn, MongoOper.IS);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java View file @ faf9fac
... ... @@ -144,9 +144,9 @@
144 144 if (CollectionUtils.isNotEmpty(records)) {
145 145 TrackDownRecord track = records.get(0);
146 146 trackDownRecord.setId(track.getId());
147   - if (track.getTrackType() == TrackDownDateEnums.C.getId()) {
  147 + if (track.getTrackType()== TrackDownDateEnums.C.getId()) {
148 148 trackDownRecord.setTrackType(TrackDownDateEnums.I.getId());
149   - } else if (track.getTrackType() == TrackDownDateEnums.H.getId()) {
  149 + }else if(track.getTrackType()== TrackDownDateEnums.H.getId()){
150 150 trackDownRecord.setTrackType(TrackDownDateEnums.E.getId());
151 151 }
152 152 }
... ... @@ -245,7 +245,8 @@
245 245 }
246 246  
247 247  
248   - public String getSieveStatus(String patientId, String hospitalId) {
  248 + public String getSieveStatus(String patientId,String hospitalId)
  249 + {
249 250  
250 251 String siveStatus = "";
251 252 SieveQuery sieveQuery = new SieveQuery();
252 253  
253 254  
254 255  
255 256  
256 257  
257 258  
258 259  
259 260  
260 261  
261 262  
262 263  
263 264  
264 265  
265 266  
266 267  
... ... @@ -254,58 +255,73 @@
254 255 sieveQuery.setParentId(patientId);
255 256 //查询产筛list
256 257 List<SieveModel> list = sieveService.queryList1(sieveQuery, "order");
257   - if (CollectionUtils.isNotEmpty(list)) {
  258 + if (CollectionUtils.isNotEmpty(list))
  259 + {
258 260 SieveModel model = list.get(0);
259   - if (model.getZtfx() == null) {
  261 + if (model.getZtfx() == null)
  262 + {
260 263 SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery();
261 264 sieveApplyOrderQuery1.setParentId(patientId);
262 265 sieveApplyOrderQuery1.setHospitalId(hospitalId);
263 266 sieveApplyOrderQuery1.setYn(YnEnums.YES.getId());
264 267 List<SieveApplyOrderModel> list1 = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1);
265   - if (CollectionUtils.isEmpty(list1)) {
  268 + if (CollectionUtils.isEmpty(list1))
  269 + {
266 270 siveStatus = "未产筛";
267   - } else {
  271 + }
  272 + else
  273 + {
268 274 siveStatus = "已申请";
269 275 }
270   - } else {
  276 + }
  277 + else
  278 + {
271 279 siveStatus = SieveEnums.getTitle(model.getZtfx());
272 280 }
273   - } else {
  281 + }
  282 + else
  283 + {
274 284 SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery();
275 285 sieveApplyOrderQuery1.setParentId(patientId);
276 286 sieveApplyOrderQuery1.setHospitalId(hospitalId);
277 287 sieveApplyOrderQuery1.setYn(YnEnums.YES.getId());
278 288 List<SieveApplyOrderModel> list1 = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1);
279   - if (CollectionUtils.isEmpty(list1)) {
  289 + if (CollectionUtils.isEmpty(list1))
  290 + {
280 291 siveStatus = "未产筛";
281   - } else {
  292 + }
  293 + else
  294 + {
282 295 SieveResultQuery sieveResultQuery = new SieveResultQuery();
283 296 sieveResultQuery.setParentId(patientId);
284 297 sieveResultQuery.setYn(YnEnums.YES.getId());
285 298 List<SieveResultModel> resultModels = sieveService.queryListSieveResult(sieveResultQuery);
286   - if (CollectionUtils.isNotEmpty(resultModels)) {
  299 + if (CollectionUtils.isNotEmpty(resultModels))
  300 + {
287 301  
288 302 SieveResultModel resultModel = resultModels.get(0);
289 303  
290   - List<Integer> slist = new ArrayList<>();
  304 + List<Integer> slist =new ArrayList<>();
291 305  
292   - if (StringUtils.isNotEmpty(resultModel.getTszhz())) {
  306 + if(StringUtils.isNotEmpty(resultModel.getTszhz())){
293 307 slist.add(Integer.valueOf(resultModel.getTszhz()));
294 308 }
295   - if (StringUtils.isNotEmpty(resultModel.getSjgjx())) {
  309 + if(StringUtils.isNotEmpty(resultModel.getSjgjx())){
296 310 slist.add(Integer.valueOf(resultModel.getSjgjx()));
297 311 }
298   - if (StringUtils.isNotEmpty(resultModel.getSbst())) {
  312 + if(StringUtils.isNotEmpty(resultModel.getSbst())){
299 313 slist.add(Integer.valueOf(resultModel.getSbst()));
300 314 }
301   - if (StringUtils.isNotEmpty(resultModel.getDzhpx())) {
  315 + if(StringUtils.isNotEmpty(resultModel.getDzhpx())){
302 316 slist.add(Integer.valueOf(resultModel.getDzhpx()));
303 317 }
304   - if (StringUtils.isNotEmpty(resultModel.getStzhz13())) {
  318 + if(StringUtils.isNotEmpty(resultModel.getStzhz13())){
305 319 slist.add(Integer.valueOf(resultModel.getStzhz13()));
306 320 }
307 321 siveStatus = SieveEnums.getTitle(Collections.max(slist));
308   - } else {
  322 + }
  323 + else
  324 + {
309 325 siveStatus = "已申请";
310 326 }
311 327 }
... ... @@ -321,8 +337,8 @@
321 337 * @param cqSieveQueryRequest
322 338 * @return
323 339 */
324   - public BaseResponse queryList(CqSieveQueryRequest cqSieveQueryRequest, Integer userId, String needPage, boolean isSieveLagManage) {
325   -
  340 + public BaseResponse queryList(CqSieveQueryRequest cqSieveQueryRequest, Integer userId, String needPage,boolean isSieveLagManage) {
  341 + List<SieveListResult> data = new ArrayList<>();
326 342 SieveQuery sieveQuery = new SieveQuery();
327 343 sieveQuery.setQueryNo(cqSieveQueryRequest.getQueryNo());
328 344 sieveQuery.setYn(YnEnums.YES.getId());
329 345  
330 346  
331 347  
... ... @@ -380,17 +396,44 @@
380 396 sieveQuery.setNeed(needPage);
381 397 String hospitalId = autoMatchFacade.getHospitalId(userId);
382 398  
383   - if (isSieveLagManage) {
  399 + if(isSieveLagManage)
  400 + {
384 401 sieveQuery.setApplyHospitalId(hospitalId);
385 402 sieveQuery.setSieveHospitalId(hospitalId);
386   - } else {
  403 + }
  404 + else
  405 + {
387 406 sieveQuery.setHospitalId(hospitalId);
388 407 }
389 408  
  409 + if (StringUtils.isNotEmpty(cqSieveQueryRequest.getNumber()))
  410 + {
  411 + List<String> parentIds = new ArrayList<>();
  412 + SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery();
  413 + sieveApplyOrderQuery.setSieveHospitalId(hospitalId);
  414 + sieveApplyOrderQuery.setNumber(cqSieveQueryRequest.getNumber());
  415 + sieveApplyOrderQuery.setYn(YnEnums.YES.getId());
  416 + List<SieveApplyOrderModel> sieveApplyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery);
  417 + if (CollectionUtils.isNotEmpty(sieveApplyOrderModels))
  418 + {
  419 + for(SieveApplyOrderModel model : sieveApplyOrderModels)
  420 + {
  421 + parentIds.add(model.getParentId());
  422 + }
  423 + }
  424 + if (CollectionUtils.isNotEmpty(parentIds))
  425 + {
  426 + sieveQuery.setParentIds(parentIds);
  427 + }
  428 + else
  429 + {
  430 + return new BaseListResponse().setData(data).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(sieveQuery.getPageInfo());
  431 + }
  432 + }
390 433  
391 434 //查询产筛list
392 435 List<SieveModel> list = sieveService.queryList1(sieveQuery, "order");
393   - List<SieveListResult> data = new ArrayList<>();
  436 +
394 437 int batchSize = 4;
395 438 int end = 0;
396 439 List<Future> listFuture = new ArrayList<>();
... ... @@ -399,7 +442,7 @@
399 442 if (end > list.size()) {
400 443 end = list.size();
401 444 }
402   - listFuture.add(commonThreadPool.submit(new SieveWorker(hospitalId, list.subList(i, end), antenatalExaminationService, patientsService, applyOrderService, organizationService)));
  445 + listFuture.add(commonThreadPool.submit(new SieveWorker(hospitalId, list.subList(i, end), antenatalExaminationService, patientsService,applyOrderService,organizationService)));
403 446 }
404 447 for (Future f : listFuture) {
405 448 try {
... ... @@ -414,7 +457,7 @@
414 457 public void exportCqsieves(CqSieveQueryRequest cqSieveQueryRequest, Integer id, HttpServletResponse response) {
415 458 try {
416 459  
417   - BaseListResponse listResponse = (BaseListResponse) queryList(cqSieveQueryRequest, id, null, false);
  460 + BaseListResponse listResponse = (BaseListResponse) queryList(cqSieveQueryRequest, id, null,false);
418 461  
419 462 List<SieveListResult> list = listResponse.getData();
420 463 List<Map<String, Object>> datas = new ArrayList<>();
421 464  
422 465  
423 466  
424 467  
425 468  
... ... @@ -520,31 +563,36 @@
520 563 }
521 564  
522 565 /**
523   - * 添加查询前 查询孕妇基本信息 如果孕妇没有在本院建档就添加隐藏档案
524   - *
  566 + * 添加查询前 查询孕妇基本信息 如果孕妇没有在本院建档就添加隐藏档案
525 567 * @param cardNo
526 568 * @param userId
527 569 * @return
528 570 */
529   - public BaseResponse querySievePatientInfo(String cardNo, String vcCardNo, Integer userId) {
  571 + public BaseResponse querySievePatientInfo(String cardNo,String vcCardNo, Integer userId) {
530 572  
531 573 String hospitalId = autoMatchFacade.getHospitalId(userId);
532 574  
533 575 PatientsQuery patientsQuery = new PatientsQuery();
534 576 patientsQuery.setHospitalId(hospitalId);
535 577 patientsQuery.setYn(YnEnums.YES.getId());
536   - if (StringUtils.isNotEmpty(cardNo)) {
  578 + if (StringUtils.isNotEmpty(cardNo))
  579 + {
537 580 patientsQuery.setPhoneOrCert(cardNo);
538   - } else if (StringUtils.isNotEmpty(vcCardNo)) {
  581 + }
  582 + else if (StringUtils.isNotEmpty(vcCardNo))
  583 + {
539 584 patientsQuery.setVcCardNo(vcCardNo);
540 585 }
541 586  
542 587  
543 588 List<Patients> localPatients = patientsService.queryPatient(patientsQuery);
544 589 Patients pat = null;
545   - if (CollectionUtils.isNotEmpty(localPatients)) {
  590 + if (CollectionUtils.isNotEmpty(localPatients))
  591 + {
546 592 pat = localPatients.get(0);
547   - } else {
  593 + }
  594 + else
  595 + {
548 596 patientsQuery.setHospitalId(null);
549 597 List<Patients> areaPatients = patientsService.queryPatient(patientsQuery);
550 598 if (CollectionUtils.isNotEmpty(areaPatients)) {
... ... @@ -554,7 +602,9 @@
554 602 String id = antenatalExaminationFacade.handHideBuild(pat.getPid(), pat.getId(), userId, 1);
555 603  
556 604 pat = patientsService.findOnePatientById(id);
557   - } else {
  605 + }
  606 + else
  607 + {
558 608 return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("没有档案，请建档后申请产筛");
559 609 }
560 610 }
... ... @@ -573,7 +623,8 @@
573 623 antExChuQuery.setYn(YnEnums.YES.getId());
574 624  
575 625 List<AntExChuModel> list = antenatalExaminationService.queryAntExChu(antExChuQuery);
576   - if (CollectionUtils.isNotEmpty(list)) {
  626 + if (CollectionUtils.isNotEmpty(list))
  627 + {
577 628 AntExChuModel chuModel = list.get(0);
578 629 patientBaseResult.setWeight(chuModel.getYqWeight());
579 630 }
580 631  
... ... @@ -581,9 +632,9 @@
581 632 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(patientBaseResult);
582 633 }
583 634  
584   - public BaseResponse getSieveApplyInfo(String parentId, Integer userId, Integer type) {
  635 + public BaseResponse getSieveApplyInfo(String parentId, Integer userId,Integer type) {
585 636  
586   - Map<String, Object> map = new HashMap<>();
  637 + Map<String,Object> map = new HashMap<>();
587 638 String hospitalId = autoMatchFacade.getHospitalId(userId);
588 639  
589 640 PatientsQuery patientsQuery = new PatientsQuery();
590 641  
... ... @@ -593,9 +644,12 @@
593 644  
594 645 List<Patients> localPatients = patientsService.queryPatient(patientsQuery);
595 646 Patients pat = null;
596   - if (CollectionUtils.isNotEmpty(localPatients)) {
  647 + if (CollectionUtils.isNotEmpty(localPatients))
  648 + {
597 649 pat = localPatients.get(0);
598   - } else {
  650 + }
  651 + else
  652 + {
599 653 patientsQuery.setHospitalId(null);
600 654 List<Patients> areaPatients = patientsService.queryPatient(patientsQuery);
601 655 if (CollectionUtils.isNotEmpty(areaPatients)) {
... ... @@ -605,7 +659,9 @@
605 659 String id = antenatalExaminationFacade.handHideBuild(pat.getPid(), pat.getId(), userId, 1);
606 660  
607 661 pat = patientsService.findOnePatientById(id);
608   - } else {
  662 + }
  663 + else
  664 + {
609 665 return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("没有档案，请建档后申请产筛");
610 666 }
611 667 }
612 668  
613 669  
614 670  
615 671  
616 672  
617 673  
618 674  
619 675  
620 676  
621 677  
622 678  
623 679  
624 680  
625 681  
626 682  
627 683  
628 684  
... ... @@ -626,89 +682,95 @@
626 682 sieveApplyOrderQuery1.setHospitalId(hospitalId);
627 683 sieveApplyOrderQuery1.setYn(YnEnums.YES.getId());
628 684  
629   - if (type == 4) {
  685 + if (type == 4)
  686 + {
630 687  
631   - Map<String, Object> sieveResultEditInfo = new HashMap<>();
  688 + Map<String,Object> sieveResultEditInfo = new HashMap<>();
632 689 SieveResultQuery sieveResultQuery = new SieveResultQuery();
633 690 sieveResultQuery.setParentId(parentId);
634 691 sieveResultQuery.setYn(YnEnums.YES.getId());
635 692 List<SieveResultModel> list = sieveService.queryListSieveResult(sieveResultQuery);
636   - if (CollectionUtils.isNotEmpty(list)) {
  693 + if (CollectionUtils.isNotEmpty(list))
  694 + {
637 695 SieveResultModel model = list.get(0);
638   - sieveResultEditInfo.put("id", model.getId());
639   - sieveResultEditInfo.put("hcg", model.getHcg() != null ? model.getHcg() : "");
640   - sieveResultEditInfo.put("hcgMom", model.getHcgMom() != null ? model.getHcgMom() : "");
641   - sieveResultEditInfo.put("hafp", model.getHafp() != null ? model.getHafp() : "");
642   - sieveResultEditInfo.put("hafpMom", model.getHafpMom() != null ? model.getHafpMom() : "");
  696 + sieveResultEditInfo.put("id",model.getId());
  697 + sieveResultEditInfo.put("hcg",model.getHcg() != null ? model.getHcg() : "");
  698 + sieveResultEditInfo.put("hcgMom",model.getHcgMom() != null ? model.getHcgMom() : "");
  699 + sieveResultEditInfo.put("hafp",model.getHafp() != null ? model.getHafp() : "");
  700 + sieveResultEditInfo.put("hafpMom",model.getHafpMom() != null ? model.getHafpMom() : "");
643 701 sieveResultEditInfo.put("examineId", model.getExamineId());
644   - sieveResultEditInfo.put("checkerId", model.getCheckerId());
645   - sieveResultEditInfo.put("resultTime", DateUtil.getyyyy_MM_dd(model.getResultTime()));
  702 + sieveResultEditInfo.put("checkerId",model.getCheckerId());
  703 + sieveResultEditInfo.put("resultTime",DateUtil.getyyyy_MM_dd(model.getResultTime()));
646 704  
647   - sieveResultEditInfo.put("tszhz", model.getTszhz());
648   - sieveResultEditInfo.put("sbst", model.getSbst());
649   - sieveResultEditInfo.put("stzhz13", model.getStzhz13());
650   - sieveResultEditInfo.put("sjgjx", model.getSjgjx());
  705 + sieveResultEditInfo.put("tszhz",model.getTszhz());
  706 + sieveResultEditInfo.put("sbst",model.getSbst());
  707 + sieveResultEditInfo.put("stzhz13",model.getStzhz13());
  708 + sieveResultEditInfo.put("sjgjx",model.getSjgjx());
651 709  
652 710  
653   - sieveResultEditInfo.put("tszhzValue", model.getTszhzValue());
654   - sieveResultEditInfo.put("sbstValue", model.getSbstValue());
655   - sieveResultEditInfo.put("stzhz13Value", model.getStzhz13Value());
656   - sieveResultEditInfo.put("sjgjxValue", model.getSjgjxValue());
657   - sieveResultEditInfo.put("publishName", model.getPublishName());
  711 + sieveResultEditInfo.put("tszhzValue",model.getTszhzValue());
  712 + sieveResultEditInfo.put("sbstValue",model.getSbstValue());
  713 + sieveResultEditInfo.put("stzhz13Value",model.getStzhz13Value());
  714 + sieveResultEditInfo.put("sjgjxValue",model.getSjgjxValue());
  715 + sieveResultEditInfo.put("publishName",model.getPublishName());
658 716 }
659   - map.put("sieveResultEditInfo", sieveResultEditInfo);
660   - } else {
  717 + map.put("sieveResultEditInfo",sieveResultEditInfo);
  718 + }
  719 + else
  720 + {
661 721 List<SieveApplyOrderModel> sieveApplyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1);
662   - if (CollectionUtils.isNotEmpty(sieveApplyOrderModels)) {
663   - Map<String, Object> result = new HashMap<>();
  722 + if (CollectionUtils.isNotEmpty(sieveApplyOrderModels))
  723 + {
  724 + Map<String,Object> result = new HashMap<>();
664 725  
665   - Map<String, Object> viewInfo = new HashMap<>();
  726 + Map<String,Object> viewInfo = new HashMap<>();
666 727 SieveApplyOrderModel sieveApply = sieveApplyOrderModels.get(0);
667 728  
668   - result.put("id", sieveApply.getId());
669   - result.put("parentId", sieveApply.getParentId());
  729 + result.put("id",sieveApply.getId());
  730 + result.put("parentId",sieveApply.getParentId());
670 731  
671   - result.put("check", sieveApply.getCheckItem());
672   - result.put("guide", sieveApply.getGuide());
673   - result.put("checkDate", sieveApply.getCheckDate());
674   - result.put("applyDoctor", sieveApply.getApplyDoctor());
675   - result.put("hospitalId", sieveApply.getHospitalId());
676   - result.put("applyTime", DateUtil.getyyyy_MM_dd(sieveApply.getApplyTime()));
677   - result.put("birth", DateUtil.getyyyy_MM_dd(sieveApply.getBirth()));
678   - result.put("weight", sieveApply.getWeight());
679   - result.put("lastMenses", DateUtil.getyyyy_MM_dd(sieveApply.getLastMenses()));
680   - result.put("number", sieveApply.getNumber());
681   - result.put("collectionDoctorId", sieveApply.getCollectionDoctorId());
682   - result.put("collectionDate", DateUtil.getyyyy_MM_dd(sieveApply.getCollectionDate()));
683   - result.put("crl", sieveApply.getCrl());
684   - result.put("bpd", sieveApply.getBpd());
685   - result.put("bcCheckDate", DateUtil.getyyyy_MM_dd(sieveApply.getBcCheckDate()));
686   - result.put("historyBirth", sieveApply.getHistoryBirth());
687   - result.put("pastHistory", sieveApply.getPastHistory());
688   - result.put("sieveHospitalId", sieveApply.getSieveHospitalId());
689   - result.put("sendDoctor", sieveApply.getSendDoctor());
690   - result.put("sendTime", DateUtil.getyyyy_MM_dd(sieveApply.getSendTime()));
691   - result.put("age", DateUtil.getAge(sieveApply.getBirth(), sieveApply.getCreated()));
692   - result.put("mensesDay", sieveApply.getMensesDay());
693   - result.put("mensesWeek", sieveApply.getMensesWeek());
694   - result.put("experimentNum", "");
  732 + result.put("check",sieveApply.getCheckItem());
  733 + result.put("guide",sieveApply.getGuide());
  734 + result.put("checkDate",sieveApply.getCheckDate());
  735 + result.put("applyDoctor",sieveApply.getApplyDoctor());
  736 + result.put("hospitalId",sieveApply.getHospitalId());
  737 + result.put("applyTime",DateUtil.getyyyy_MM_dd(sieveApply.getApplyTime()));
  738 + result.put("birth",DateUtil.getyyyy_MM_dd(sieveApply.getBirth()));
  739 + result.put("weight",sieveApply.getWeight());
  740 + result.put("lastMenses",DateUtil.getyyyy_MM_dd(sieveApply.getLastMenses()));
  741 + result.put("number",sieveApply.getNumber());
  742 + result.put("collectionDoctorId",sieveApply.getCollectionDoctorId());
  743 + result.put("collectionDate",DateUtil.getyyyy_MM_dd(sieveApply.getCollectionDate()));
  744 + result.put("crl",sieveApply.getCrl());
  745 + result.put("bpd",sieveApply.getBpd());
  746 + result.put("bcCheckDate",DateUtil.getyyyy_MM_dd(sieveApply.getBcCheckDate()));
  747 + result.put("historyBirth",sieveApply.getHistoryBirth());
  748 + result.put("pastHistory",sieveApply.getPastHistory());
  749 + result.put("sieveHospitalId",sieveApply.getSieveHospitalId());
  750 + result.put("sendDoctor",sieveApply.getSendDoctor());
  751 + result.put("sendTime",DateUtil.getyyyy_MM_dd(sieveApply.getSendTime()));
  752 + result.put("age",DateUtil.getAge(sieveApply.getBirth(), sieveApply.getCreated()));
  753 + result.put("mensesDay",sieveApply.getMensesDay());
  754 + result.put("mensesWeek",sieveApply.getMensesWeek());
  755 + result.put("experimentNum","");
695 756  
696   - map.put("sieveApplyInfo", result);
  757 + map.put("sieveApplyInfo",result);
697 758  
698   - if (type == 1 || type == 3) {
699   - String applyDoctorName = CommonsHelper.getUserName(sieveApply.getApplyDoctor(), usersService);
700   - viewInfo.put("applyDoctorName", applyDoctorName);
  759 + if (type == 1 || type == 3)
  760 + {
  761 + String applyDoctorName = CommonsHelper.getUserName(sieveApply.getApplyDoctor(),usersService);
  762 + viewInfo.put("applyDoctorName",applyDoctorName);
701 763  
702   - String collectionDoctorName = CommonsHelper.getUserName(sieveApply.getCollectionDoctorId(), usersService);
703   - viewInfo.put("collectionDoctorName", collectionDoctorName);
  764 + String collectionDoctorName = CommonsHelper.getUserName(sieveApply.getCollectionDoctorId(),usersService);
  765 + viewInfo.put("collectionDoctorName",collectionDoctorName);
704 766  
705   - String sendDoctorName = CommonsHelper.getUserName(sieveApply.getSendDoctor(), usersService);
706   - viewInfo.put("sendDoctorName", sendDoctorName);
  767 + String sendDoctorName = CommonsHelper.getUserName(sieveApply.getSendDoctor(),usersService);
  768 + viewInfo.put("sendDoctorName",sendDoctorName);
707 769  
708   - String applyHospitalName = CommonsHelper.getHospitalName(sieveApply.getSieveHospitalId(), organizationService);
  770 + String applyHospitalName = CommonsHelper.getHospitalName(sieveApply.getSieveHospitalId(),organizationService);
709 771 viewInfo.put("applyHospitalName", applyHospitalName);
710 772  
711   - String currentHospitalName = CommonsHelper.getHospitalName(sieveApply.getHospitalId(), organizationService);
  773 + String currentHospitalName = CommonsHelper.getHospitalName(sieveApply.getHospitalId(),organizationService);
712 774 viewInfo.put("currentHospitalName", currentHospitalName);
713 775  
714 776 String isTire = "";
715 777  
716 778  
717 779  
718 780  
719 781  
720 782  
721 783  
722 784  
723 785  
724 786  
725 787  
726 788  
727 789  
728 790  
729 791  
730 792  
731 793  
732 794  
733 795  
... ... @@ -717,74 +779,82 @@
717 779 antExChuQuery1.setParentId(parentId);
718 780 antExChuQuery1.setYn(YnEnums.YES.getId());
719 781 List<AntExChuModel> data1 = antenatalExaminationService.queryAntExChu(antExChuQuery1);
720   - if (CollectionUtils.isNotEmpty(data1)) {
  782 + if (CollectionUtils.isNotEmpty(data1))
  783 + {
721 784 AntExChuModel chuModel = data1.get(0);
722   - if (StringUtils.isNotEmpty(chuModel.getTireNumber())) {
723   - isTire = Integer.parseInt(chuModel.getTireNumber()) > 1 ? "是" : "否";
  785 + if (StringUtils.isNotEmpty(chuModel.getTireNumber()))
  786 + {
  787 + isTire = Integer.parseInt(chuModel.getTireNumber()) > 1 ? "是":"否";
724 788 tireNumber = chuModel.getTireNumber();
725 789 }
726 790 }
727 791 map.put("isTire", isTire);
728   - map.put("tireNumber", tireNumber);
729   - map.put("viewInfo", viewInfo);
  792 + map.put("tireNumber",tireNumber);
  793 + map.put("viewInfo",viewInfo);
730 794  
731   - if (type == 3) {
732   - Map<String, Object> sieveResultInfo = new HashMap<>();
  795 + if (type == 3)
  796 + {
  797 + Map<String,Object> sieveResultInfo = new HashMap<>();
733 798  
734 799 SieveResultQuery sieveResultQuery = new SieveResultQuery();
735 800 sieveResultQuery.setParentId(parentId);
736 801 sieveResultQuery.setYn(YnEnums.YES.getId());
737 802 List<SieveResultModel> list = sieveService.queryListSieveResult(sieveResultQuery);
738   - if (CollectionUtils.isNotEmpty(list)) {
  803 + if (CollectionUtils.isNotEmpty(list))
  804 + {
739 805 SieveResultModel sieveResultModel = list.get(0);
740   - sieveResultInfo.put("hcg", sieveResultModel.getHcg() != null ? sieveResultModel.getHcg() + "ng/ml" : "");
741   - sieveResultInfo.put("hcgMom", sieveResultModel.getHcgMom() != null ? sieveResultModel.getHcgMom() : "");
742   - sieveResultInfo.put("hafp", sieveResultModel.getHafp() != null ? sieveResultModel.getHafp() + "U/ml" : "");
743   - sieveResultInfo.put("hafpMom", sieveResultModel.getHafpMom() != null ? sieveResultModel.getHafpMom() : "");
  806 + sieveResultInfo.put("hcg",sieveResultModel.getHcg() != null ? sieveResultModel.getHcg()+"ng/ml" : "");
  807 + sieveResultInfo.put("hcgMom",sieveResultModel.getHcgMom() != null ? sieveResultModel.getHcgMom() : "");
  808 + sieveResultInfo.put("hafp",sieveResultModel.getHafp() != null ? sieveResultModel.getHafp()+"U/ml" : "");
  809 + sieveResultInfo.put("hafpMom",sieveResultModel.getHafpMom() != null ? sieveResultModel.getHafpMom() : "");
744 810 sieveResultInfo.put("examineName", CommonsHelper.getUserName(sieveResultModel.getExamineId(), usersService));
745   - sieveResultInfo.put("checkerName", CommonsHelper.getUserName(sieveResultModel.getCheckerId(), usersService));
746   - sieveResultInfo.put("reportTime", DateUtil.getyyyy_MM_dd(sieveResultModel.getResultTime()));
  811 + sieveResultInfo.put("checkerName",CommonsHelper.getUserName(sieveResultModel.getCheckerId(), usersService));
  812 + sieveResultInfo.put("reportTime",DateUtil.getyyyy_MM_dd(sieveResultModel.getResultTime()));
747 813  
748 814 String tszhzValue = "";
749   - if (StringUtils.isNotEmpty(sieveResultModel.getTszhz()) && sieveResultModel.getTszhzValue() != null && sieveResultModel.getTszhzValue().size() > 0) {
  815 + if (StringUtils.isNotEmpty(sieveResultModel.getTszhz()) && sieveResultModel.getTszhzValue() != null && sieveResultModel.getTszhzValue().size() > 0)
  816 + {
750 817  
751 818 String valueOne = sieveResultModel.getTszhzValue().get("valueOne");
752 819 String valueTwo = sieveResultModel.getTszhzValue().get("valueTwo");
753   - tszhzValue = valueOne + "/" + valueTwo + ("0".equals(sieveResultModel.getTszhz()) ? "低风险" : "1".equals(sieveResultModel.getTszhz()) ? "临界值" : "高风险");
  820 + tszhzValue = valueOne + "/"+valueTwo+("0".equals(sieveResultModel.getTszhz()) ? "低风险" : "1".equals(sieveResultModel.getTszhz()) ? "临界值" : "高风险");
754 821 }
755   - sieveResultInfo.put("tszhz", tszhzValue);
  822 + sieveResultInfo.put("tszhz",tszhzValue);
756 823  
757 824  
758 825 String sbst = "";
759   - if (StringUtils.isNotEmpty(sieveResultModel.getSbst()) && sieveResultModel.getSbstValue() != null && sieveResultModel.getSbstValue().size() > 0) {
  826 + if (StringUtils.isNotEmpty(sieveResultModel.getSbst()) && sieveResultModel.getSbstValue() != null && sieveResultModel.getSbstValue().size() > 0)
  827 + {
760 828  
761 829 String valueOne = sieveResultModel.getSbstValue().get("valueOne");
762 830 String valueTwo = sieveResultModel.getSbstValue().get("valueTwo");
763   - sbst = valueOne + "/" + valueTwo + ("0".equals(sieveResultModel.getSbst()) ? "低风险" : "1".equals(sieveResultModel.getSbst()) ? "临界值" : "高风险");
  831 + sbst = valueOne + "/"+valueTwo+("0".equals(sieveResultModel.getSbst()) ? "低风险" : "1".equals(sieveResultModel.getSbst()) ? "临界值" : "高风险");
764 832 }
765   - sieveResultInfo.put("sbst", sbst);
  833 + sieveResultInfo.put("sbst",sbst);
766 834  
767 835  
768   - String sjgjx = "";
769   - if (StringUtils.isNotEmpty(sieveResultModel.getSjgjx()) && sieveResultModel.getSjgjxValue() != null && sieveResultModel.getSjgjxValue().size() > 0) {
  836 + String sjgjx = "";
  837 + if (StringUtils.isNotEmpty(sieveResultModel.getSjgjx()) && sieveResultModel.getSjgjxValue() != null && sieveResultModel.getSjgjxValue().size() > 0)
  838 + {
770 839  
771 840 String valueOne = sieveResultModel.getSjgjxValue().get("valueOne");
772 841 String valueTwo = sieveResultModel.getSjgjxValue().get("valueTwo");
773   - sjgjx = valueOne + "/" + valueTwo + ("0".equals(sieveResultModel.getSjgjx()) ? "低风险" : "1".equals(sieveResultModel.getSjgjx()) ? "临界值" : "高风险");
  842 + sjgjx = valueOne + "/"+valueTwo+("0".equals(sieveResultModel.getSjgjx()) ? "低风险" : "1".equals(sieveResultModel.getSjgjx()) ? "临界值" : "高风险");
774 843 }
775   - sieveResultInfo.put("sjgjx", sjgjx);
  844 + sieveResultInfo.put("sjgjx",sjgjx);
776 845  
777   - String stzhz13 = "";
778   - if (StringUtils.isNotEmpty(sieveResultModel.getStzhz13()) && sieveResultModel.getStzhz13Value() != null && sieveResultModel.getStzhz13Value().size() > 0) {
  846 + String stzhz13 = "";
  847 + if (StringUtils.isNotEmpty(sieveResultModel.getStzhz13()) && sieveResultModel.getStzhz13Value() != null && sieveResultModel.getStzhz13Value().size() > 0)
  848 + {
779 849 String valueOne = sieveResultModel.getStzhz13Value().get("valueOne");
780 850 String valueTwo = sieveResultModel.getStzhz13Value().get("valueTwo");
781   - stzhz13 = valueOne + "/" + valueTwo + ("0".equals(sieveResultModel.getStzhz13()) ? "低风险" : "1".equals(sieveResultModel.getStzhz13()) ? "临界值" : "高风险");
  851 + stzhz13 = valueOne + "/"+valueTwo+("0".equals(sieveResultModel.getStzhz13()) ? "低风险" : "1".equals(sieveResultModel.getStzhz13()) ? "临界值" : "高风险");
782 852 }
783   - sieveResultInfo.put("stzhz13", stzhz13);
  853 + sieveResultInfo.put("stzhz13",stzhz13);
784 854  
785 855  
786 856 }
787   - map.put("sieveResultInfo", sieveResultInfo);
  857 + map.put("sieveResultInfo",sieveResultInfo);
788 858 }
789 859 }
790 860 }
791 861  
... ... @@ -984,15 +1054,18 @@
984 1054  
985 1055 public BaseResponse reviceSieve(List<String> parentIds, Integer userId) {
986 1056 String hospitalId = autoMatchFacade.getHospitalId(userId);
987   - if (CollectionUtils.isNotEmpty(parentIds)) {
  1057 + if (CollectionUtils.isNotEmpty(parentIds))
  1058 + {
988 1059 SieveQuery query = new SieveQuery();
989 1060 query.setParentIds(parentIds);
990 1061 query.setYn(YnEnums.YES.getId());
991 1062 query.setApplyHospitalId(hospitalId);
992 1063 List<SieveModel> list = sieveService.queryList(query);
993 1064  
994   - if (CollectionUtils.isNotEmpty(list)) {
995   - for (SieveModel sieve : list) {
  1065 + if (CollectionUtils.isNotEmpty(list))
  1066 + {
  1067 + for (SieveModel sieve : list)
  1068 + {
996 1069 sieve.setReviceStatus(2);
997 1070 sieveService.updateOneChanQianDiaSieve(sieve);
998 1071 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java View file @ faf9fac
... ... @@ -161,6 +161,9 @@
161 161 //是否畸形 0非畸形 1畸形
162 162 private Integer malformation;
163 163  
  164 + //nbna评分(神经测定)
  165 + private String nbnaNum;
  166 +
164 167 /***畸形详情****/
165 168 //无脑畸形
166 169 private boolean jxWn;
... ... @@ -310,6 +313,15 @@
310 313  
311 314 //档案编号 滦平需求
312 315 private String fileCode;
  316 +
  317 +
  318 + public String getNbnaNum() {
  319 + return nbnaNum;
  320 + }
  321 +
  322 + public void setNbnaNum(String nbnaNum) {
  323 + this.nbnaNum = nbnaNum;
  324 + }
313 325  
314 326 public Integer getYn() {
315 327 return yn;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CqSieveQueryRequest.java View file @ faf9fac
... ... @@ -60,6 +60,17 @@
60 60 //申请医院
61 61 private String applyHospitalId;
62 62  
  63 + //标本号
  64 + private String number;
  65 +
  66 + public String getNumber() {
  67 + return number;
  68 + }
  69 +
  70 + public void setNumber(String number) {
  71 + this.number = number;
  72 + }
  73 +
63 74 public String getApplyHospitalId() {
64 75 return applyHospitalId;
65 76 }