jiangjiazhi / regional-platform

Download as
Browse Code »

Commit cd4c98a666806c3558a76056e288ac5b53960f00

Authored by yangfei
1 parent 038e6596e2
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

追访

Showing 2 changed files with 211 additions and 319 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/SieveResultModel.java View file @ cd4c98a
1 1 package com.lyms.platform.pojo;
2 2  
3 3 import com.lyms.platform.beans.SerialIdEnum;
4   -import com.lyms.platform.common.result.BaseModel;
5 4 import org.springframework.data.mongodb.core.mapping.Document;
6 5  
7 6 import java.util.Date;
... ... @@ -49,7 +48,7 @@
49 48 private String hafp;
50 49  
51 50  
52   - //hCgMom
  51 + //hCgMomhCgMom
53 52 private String hcgMom;
54 53  
55 54 //hafpMom
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java View file @ cd4c98a
... ... @@ -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,8 +245,7 @@
245 245 }
246 246  
247 247  
248   - public String getSieveStatus(String patientId,String hospitalId)
249   - {
  248 + public String getSieveStatus(String patientId, String hospitalId) {
250 249  
251 250 String siveStatus = "";
252 251 SieveQuery sieveQuery = new SieveQuery();
253 252  
254 253  
255 254  
256 255  
257 256  
258 257  
259 258  
260 259  
261 260  
262 261  
263 262  
264 263  
265 264  
266 265  
267 266  
... ... @@ -255,73 +254,58 @@
255 254 sieveQuery.setParentId(patientId);
256 255 //查询产筛list
257 256 List<SieveModel> list = sieveService.queryList1(sieveQuery, "order");
258   - if (CollectionUtils.isNotEmpty(list))
259   - {
  257 + if (CollectionUtils.isNotEmpty(list)) {
260 258 SieveModel model = list.get(0);
261   - if (model.getZtfx() == null)
262   - {
  259 + if (model.getZtfx() == null) {
263 260 SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery();
264 261 sieveApplyOrderQuery1.setParentId(patientId);
265 262 sieveApplyOrderQuery1.setHospitalId(hospitalId);
266 263 sieveApplyOrderQuery1.setYn(YnEnums.YES.getId());
267 264 List<SieveApplyOrderModel> list1 = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1);
268   - if (CollectionUtils.isEmpty(list1))
269   - {
  265 + if (CollectionUtils.isEmpty(list1)) {
270 266 siveStatus = "未产筛";
271   - }
272   - else
273   - {
  267 + } else {
274 268 siveStatus = "已申请";
275 269 }
276   - }
277   - else
278   - {
  270 + } else {
279 271 siveStatus = SieveEnums.getTitle(model.getZtfx());
280 272 }
281   - }
282   - else
283   - {
  273 + } else {
284 274 SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery();
285 275 sieveApplyOrderQuery1.setParentId(patientId);
286 276 sieveApplyOrderQuery1.setHospitalId(hospitalId);
287 277 sieveApplyOrderQuery1.setYn(YnEnums.YES.getId());
288 278 List<SieveApplyOrderModel> list1 = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1);
289   - if (CollectionUtils.isEmpty(list1))
290   - {
  279 + if (CollectionUtils.isEmpty(list1)) {
291 280 siveStatus = "未产筛";
292   - }
293   - else
294   - {
  281 + } else {
295 282 SieveResultQuery sieveResultQuery = new SieveResultQuery();
296 283 sieveResultQuery.setParentId(patientId);
297 284 sieveResultQuery.setYn(YnEnums.YES.getId());
298 285 List<SieveResultModel> resultModels = sieveService.queryListSieveResult(sieveResultQuery);
299   - if (CollectionUtils.isNotEmpty(resultModels))
300   - {
  286 + if (CollectionUtils.isNotEmpty(resultModels)) {
301 287  
302 288 SieveResultModel resultModel = resultModels.get(0);
303 289  
304   - List<Integer> slist =new ArrayList<>();
  290 + List<Integer> slist = new ArrayList<>();
305 291  
306   - if(StringUtils.isNotEmpty(resultModel.getTszhz())){
  292 + if (StringUtils.isNotEmpty(resultModel.getTszhz())) {
307 293 slist.add(Integer.valueOf(resultModel.getTszhz()));
308 294 }
309   - if(StringUtils.isNotEmpty(resultModel.getSjgjx())){
  295 + if (StringUtils.isNotEmpty(resultModel.getSjgjx())) {
310 296 slist.add(Integer.valueOf(resultModel.getSjgjx()));
311 297 }
312   - if(StringUtils.isNotEmpty(resultModel.getSbst())){
  298 + if (StringUtils.isNotEmpty(resultModel.getSbst())) {
313 299 slist.add(Integer.valueOf(resultModel.getSbst()));
314 300 }
315   - if(StringUtils.isNotEmpty(resultModel.getDzhpx())){
  301 + if (StringUtils.isNotEmpty(resultModel.getDzhpx())) {
316 302 slist.add(Integer.valueOf(resultModel.getDzhpx()));
317 303 }
318   - if(StringUtils.isNotEmpty(resultModel.getStzhz13())){
  304 + if (StringUtils.isNotEmpty(resultModel.getStzhz13())) {
319 305 slist.add(Integer.valueOf(resultModel.getStzhz13()));
320 306 }
321 307 siveStatus = SieveEnums.getTitle(Collections.max(slist));
322   - }
323   - else
324   - {
  308 + } else {
325 309 siveStatus = "已申请";
326 310 }
327 311 }
... ... @@ -337,7 +321,7 @@
337 321 * @param cqSieveQueryRequest
338 322 * @return
339 323 */
340   - public BaseResponse queryList(CqSieveQueryRequest cqSieveQueryRequest, Integer userId, String needPage,boolean isSieveLagManage) {
  324 + public BaseResponse queryList(CqSieveQueryRequest cqSieveQueryRequest, Integer userId, String needPage, boolean isSieveLagManage) {
341 325 List<SieveListResult> data = new ArrayList<>();
342 326 SieveQuery sieveQuery = new SieveQuery();
343 327 sieveQuery.setQueryNo(cqSieveQueryRequest.getQueryNo());
344 328  
345 329  
346 330  
347 331  
348 332  
... ... @@ -396,37 +380,28 @@
396 380 sieveQuery.setNeed(needPage);
397 381 String hospitalId = autoMatchFacade.getHospitalId(userId);
398 382  
399   - if(isSieveLagManage)
400   - {
  383 + if (isSieveLagManage) {
401 384 sieveQuery.setApplyHospitalId(hospitalId);
402 385 sieveQuery.setSieveHospitalId(hospitalId);
403   - }
404   - else
405   - {
  386 + } else {
406 387 sieveQuery.setHospitalId(hospitalId);
407 388 }
408 389  
409   - if (StringUtils.isNotEmpty(cqSieveQueryRequest.getNumber()))
410   - {
  390 + if (StringUtils.isNotEmpty(cqSieveQueryRequest.getNumber())) {
411 391 List<String> parentIds = new ArrayList<>();
412 392 SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery();
413 393 sieveApplyOrderQuery.setSieveHospitalId(hospitalId);
414 394 sieveApplyOrderQuery.setNumber(cqSieveQueryRequest.getNumber());
415 395 sieveApplyOrderQuery.setYn(YnEnums.YES.getId());
416 396 List<SieveApplyOrderModel> sieveApplyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery);
417   - if (CollectionUtils.isNotEmpty(sieveApplyOrderModels))
418   - {
419   - for(SieveApplyOrderModel model : sieveApplyOrderModels)
420   - {
  397 + if (CollectionUtils.isNotEmpty(sieveApplyOrderModels)) {
  398 + for (SieveApplyOrderModel model : sieveApplyOrderModels) {
421 399 parentIds.add(model.getParentId());
422 400 }
423 401 }
424   - if (CollectionUtils.isNotEmpty(parentIds))
425   - {
  402 + if (CollectionUtils.isNotEmpty(parentIds)) {
426 403 sieveQuery.setParentIds(parentIds);
427   - }
428   - else
429   - {
  404 + } else {
430 405 return new BaseListResponse().setData(data).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(sieveQuery.getPageInfo());
431 406 }
432 407 }
... ... @@ -442,7 +417,7 @@
442 417 if (end > list.size()) {
443 418 end = list.size();
444 419 }
445   - listFuture.add(commonThreadPool.submit(new SieveWorker(hospitalId, list.subList(i, end), antenatalExaminationService, patientsService,applyOrderService,organizationService)));
  420 + listFuture.add(commonThreadPool.submit(new SieveWorker(hospitalId, list.subList(i, end), antenatalExaminationService, patientsService, applyOrderService, organizationService)));
446 421 }
447 422 for (Future f : listFuture) {
448 423 try {
... ... @@ -457,7 +432,7 @@
457 432 public void exportCqsieves(CqSieveQueryRequest cqSieveQueryRequest, Integer id, HttpServletResponse response) {
458 433 try {
459 434  
460   - BaseListResponse listResponse = (BaseListResponse) queryList(cqSieveQueryRequest, id, null,false);
  435 + BaseListResponse listResponse = (BaseListResponse) queryList(cqSieveQueryRequest, id, null, false);
461 436  
462 437 List<SieveListResult> list = listResponse.getData();
463 438 List<Map<String, Object>> datas = new ArrayList<>();
464 439  
465 440  
466 441  
467 442  
468 443  
... ... @@ -563,36 +538,31 @@
563 538 }
564 539  
565 540 /**
566   - * 添加查询前 查询孕妇基本信息 如果孕妇没有在本院建档就添加隐藏档案
  541 + * 添加查询前 查询孕妇基本信息 如果孕妇没有在本院建档就添加隐藏档案
  542 + *
567 543 * @param cardNo
568 544 * @param userId
569 545 * @return
570 546 */
571   - public BaseResponse querySievePatientInfo(String cardNo,String vcCardNo, Integer userId) {
  547 + public BaseResponse querySievePatientInfo(String cardNo, String vcCardNo, Integer userId) {
572 548  
573 549 String hospitalId = autoMatchFacade.getHospitalId(userId);
574 550  
575 551 PatientsQuery patientsQuery = new PatientsQuery();
576 552 patientsQuery.setHospitalId(hospitalId);
577 553 patientsQuery.setYn(YnEnums.YES.getId());
578   - if (StringUtils.isNotEmpty(cardNo))
579   - {
  554 + if (StringUtils.isNotEmpty(cardNo)) {
580 555 patientsQuery.setPhoneOrCert(cardNo);
581   - }
582   - else if (StringUtils.isNotEmpty(vcCardNo))
583   - {
  556 + } else if (StringUtils.isNotEmpty(vcCardNo)) {
584 557 patientsQuery.setVcCardNo(vcCardNo);
585 558 }
586 559  
587 560  
588 561 List<Patients> localPatients = patientsService.queryPatient(patientsQuery);
589 562 Patients pat = null;
590   - if (CollectionUtils.isNotEmpty(localPatients))
591   - {
  563 + if (CollectionUtils.isNotEmpty(localPatients)) {
592 564 pat = localPatients.get(0);
593   - }
594   - else
595   - {
  565 + } else {
596 566 patientsQuery.setHospitalId(null);
597 567 List<Patients> areaPatients = patientsService.queryPatient(patientsQuery);
598 568 if (CollectionUtils.isNotEmpty(areaPatients)) {
... ... @@ -602,9 +572,7 @@
602 572 String id = antenatalExaminationFacade.handHideBuild(pat.getPid(), pat.getId(), userId, 1);
603 573  
604 574 pat = patientsService.findOnePatientById(id);
605   - }
606   - else
607   - {
  575 + } else {
608 576 return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("没有档案，请建档后申请产筛");
609 577 }
610 578 }
... ... @@ -623,8 +591,7 @@
623 591 antExChuQuery.setYn(YnEnums.YES.getId());
624 592  
625 593 List<AntExChuModel> list = antenatalExaminationService.queryAntExChu(antExChuQuery);
626   - if (CollectionUtils.isNotEmpty(list))
627   - {
  594 + if (CollectionUtils.isNotEmpty(list)) {
628 595 AntExChuModel chuModel = list.get(0);
629 596 patientBaseResult.setWeight(chuModel.getYqWeight());
630 597 }
631 598  
... ... @@ -632,9 +599,9 @@
632 599 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(patientBaseResult);
633 600 }
634 601  
635   - public BaseResponse getSieveApplyInfo(String parentId, Integer userId,Integer type) {
  602 + public BaseResponse getSieveApplyInfo(String parentId, Integer userId, Integer type) {
636 603  
637   - Map<String,Object> map = new HashMap<>();
  604 + Map<String, Object> map = new HashMap<>();
638 605 String hospitalId = autoMatchFacade.getHospitalId(userId);
639 606  
640 607 PatientsQuery patientsQuery = new PatientsQuery();
641 608  
... ... @@ -644,12 +611,9 @@
644 611  
645 612 List<Patients> localPatients = patientsService.queryPatient(patientsQuery);
646 613 Patients pat = null;
647   - if (CollectionUtils.isNotEmpty(localPatients))
648   - {
  614 + if (CollectionUtils.isNotEmpty(localPatients)) {
649 615 pat = localPatients.get(0);
650   - }
651   - else
652   - {
  616 + } else {
653 617 patientsQuery.setHospitalId(null);
654 618 List<Patients> areaPatients = patientsService.queryPatient(patientsQuery);
655 619 if (CollectionUtils.isNotEmpty(areaPatients)) {
... ... @@ -659,9 +623,7 @@
659 623 String id = antenatalExaminationFacade.handHideBuild(pat.getPid(), pat.getId(), userId, 1);
660 624  
661 625 pat = patientsService.findOnePatientById(id);
662   - }
663   - else
664   - {
  626 + } else {
665 627 return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("没有档案，请建档后申请产筛");
666 628 }
667 629 }
668 630  
669 631  
670 632  
671 633  
672 634  
673 635  
674 636  
675 637  
676 638  
677 639  
678 640  
679 641  
680 642  
681 643  
682 644  
683 645  
684 646  
... ... @@ -682,95 +644,89 @@
682 644 sieveApplyOrderQuery1.setHospitalId(hospitalId);
683 645 sieveApplyOrderQuery1.setYn(YnEnums.YES.getId());
684 646  
685   - if (type == 4)
686   - {
  647 + if (type == 4) {
687 648  
688   - Map<String,Object> sieveResultEditInfo = new HashMap<>();
  649 + Map<String, Object> sieveResultEditInfo = new HashMap<>();
689 650 SieveResultQuery sieveResultQuery = new SieveResultQuery();
690 651 sieveResultQuery.setParentId(parentId);
691 652 sieveResultQuery.setYn(YnEnums.YES.getId());
692 653 List<SieveResultModel> list = sieveService.queryListSieveResult(sieveResultQuery);
693   - if (CollectionUtils.isNotEmpty(list))
694   - {
  654 + if (CollectionUtils.isNotEmpty(list)) {
695 655 SieveResultModel model = list.get(0);
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() : "");
  656 + sieveResultEditInfo.put("id", model.getId());
  657 + sieveResultEditInfo.put("hcg", model.getHcg() != null ? model.getHcg() : "");
  658 + sieveResultEditInfo.put("hcgMom", model.getHcgMom() != null ? model.getHcgMom() : "");
  659 + sieveResultEditInfo.put("hafp", model.getHafp() != null ? model.getHafp() : "");
  660 + sieveResultEditInfo.put("hafpMom", model.getHafpMom() != null ? model.getHafpMom() : "");
701 661 sieveResultEditInfo.put("examineId", model.getExamineId());
702   - sieveResultEditInfo.put("checkerId",model.getCheckerId());
703   - sieveResultEditInfo.put("resultTime",DateUtil.getyyyy_MM_dd(model.getResultTime()));
  662 + sieveResultEditInfo.put("checkerId", model.getCheckerId());
  663 + sieveResultEditInfo.put("resultTime", DateUtil.getyyyy_MM_dd(model.getResultTime()));
704 664  
705   - sieveResultEditInfo.put("tszhz",model.getTszhz());
706   - sieveResultEditInfo.put("sbst",model.getSbst());
707   - sieveResultEditInfo.put("stzhz13",model.getStzhz13());
708   - sieveResultEditInfo.put("sjgjx",model.getSjgjx());
  665 + sieveResultEditInfo.put("tszhz", model.getTszhz());
  666 + sieveResultEditInfo.put("sbst", model.getSbst());
  667 + sieveResultEditInfo.put("stzhz13", model.getStzhz13());
  668 + sieveResultEditInfo.put("sjgjx", model.getSjgjx());
709 669  
710 670  
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());
  671 + sieveResultEditInfo.put("tszhzValue", model.getTszhzValue());
  672 + sieveResultEditInfo.put("sbstValue", model.getSbstValue());
  673 + sieveResultEditInfo.put("stzhz13Value", model.getStzhz13Value());
  674 + sieveResultEditInfo.put("sjgjxValue", model.getSjgjxValue());
  675 + sieveResultEditInfo.put("publishName", model.getPublishName());
716 676 }
717   - map.put("sieveResultEditInfo",sieveResultEditInfo);
718   - }
719   - else
720   - {
  677 + map.put("sieveResultEditInfo", sieveResultEditInfo);
  678 + } else {
721 679 List<SieveApplyOrderModel> sieveApplyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1);
722   - if (CollectionUtils.isNotEmpty(sieveApplyOrderModels))
723   - {
724   - Map<String,Object> result = new HashMap<>();
  680 + if (CollectionUtils.isNotEmpty(sieveApplyOrderModels)) {
  681 + Map<String, Object> result = new HashMap<>();
725 682  
726   - Map<String,Object> viewInfo = new HashMap<>();
  683 + Map<String, Object> viewInfo = new HashMap<>();
727 684 SieveApplyOrderModel sieveApply = sieveApplyOrderModels.get(0);
728 685  
729   - result.put("id",sieveApply.getId());
730   - result.put("parentId",sieveApply.getParentId());
  686 + result.put("id", sieveApply.getId());
  687 + result.put("parentId", sieveApply.getParentId());
731 688  
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","");
  689 + result.put("check", sieveApply.getCheckItem());
  690 + result.put("guide", sieveApply.getGuide());
  691 + result.put("checkDate", sieveApply.getCheckDate());
  692 + result.put("applyDoctor", sieveApply.getApplyDoctor());
  693 + result.put("hospitalId", sieveApply.getHospitalId());
  694 + result.put("applyTime", DateUtil.getyyyy_MM_dd(sieveApply.getApplyTime()));
  695 + result.put("birth", DateUtil.getyyyy_MM_dd(sieveApply.getBirth()));
  696 + result.put("weight", sieveApply.getWeight());
  697 + result.put("lastMenses", DateUtil.getyyyy_MM_dd(sieveApply.getLastMenses()));
  698 + result.put("number", sieveApply.getNumber());
  699 + result.put("collectionDoctorId", sieveApply.getCollectionDoctorId());
  700 + result.put("collectionDate", DateUtil.getyyyy_MM_dd(sieveApply.getCollectionDate()));
  701 + result.put("crl", sieveApply.getCrl());
  702 + result.put("bpd", sieveApply.getBpd());
  703 + result.put("bcCheckDate", DateUtil.getyyyy_MM_dd(sieveApply.getBcCheckDate()));
  704 + result.put("historyBirth", sieveApply.getHistoryBirth());
  705 + result.put("pastHistory", sieveApply.getPastHistory());
  706 + result.put("sieveHospitalId", sieveApply.getSieveHospitalId());
  707 + result.put("sendDoctor", sieveApply.getSendDoctor());
  708 + result.put("sendTime", DateUtil.getyyyy_MM_dd(sieveApply.getSendTime()));
  709 + result.put("age", DateUtil.getAge(sieveApply.getBirth(), sieveApply.getCreated()));
  710 + result.put("mensesDay", sieveApply.getMensesDay());
  711 + result.put("mensesWeek", sieveApply.getMensesWeek());
  712 + result.put("experimentNum", "");
756 713  
757   - map.put("sieveApplyInfo",result);
  714 + map.put("sieveApplyInfo", result);
758 715  
759   - if (type == 1 || type == 3)
760   - {
761   - String applyDoctorName = CommonsHelper.getUserName(sieveApply.getApplyDoctor(),usersService);
762   - viewInfo.put("applyDoctorName",applyDoctorName);
  716 + if (type == 1 || type == 3) {
  717 + String applyDoctorName = CommonsHelper.getUserName(sieveApply.getApplyDoctor(), usersService);
  718 + viewInfo.put("applyDoctorName", applyDoctorName);
763 719  
764   - String collectionDoctorName = CommonsHelper.getUserName(sieveApply.getCollectionDoctorId(),usersService);
765   - viewInfo.put("collectionDoctorName",collectionDoctorName);
  720 + String collectionDoctorName = CommonsHelper.getUserName(sieveApply.getCollectionDoctorId(), usersService);
  721 + viewInfo.put("collectionDoctorName", collectionDoctorName);
766 722  
767   - String sendDoctorName = CommonsHelper.getUserName(sieveApply.getSendDoctor(),usersService);
768   - viewInfo.put("sendDoctorName",sendDoctorName);
  723 + String sendDoctorName = CommonsHelper.getUserName(sieveApply.getSendDoctor(), usersService);
  724 + viewInfo.put("sendDoctorName", sendDoctorName);
769 725  
770   - String applyHospitalName = CommonsHelper.getHospitalName(sieveApply.getSieveHospitalId(),organizationService);
  726 + String applyHospitalName = CommonsHelper.getHospitalName(sieveApply.getSieveHospitalId(), organizationService);
771 727 viewInfo.put("applyHospitalName", applyHospitalName);
772 728  
773   - String currentHospitalName = CommonsHelper.getHospitalName(sieveApply.getHospitalId(),organizationService);
  729 + String currentHospitalName = CommonsHelper.getHospitalName(sieveApply.getHospitalId(), organizationService);
774 730 viewInfo.put("currentHospitalName", currentHospitalName);
775 731  
776 732 String isTire = "";
777 733  
778 734  
779 735  
780 736  
781 737  
782 738  
783 739  
784 740  
785 741  
786 742  
787 743  
788 744  
789 745  
790 746  
791 747  
792 748  
793 749  
794 750  
795 751  
... ... @@ -779,82 +735,74 @@
779 735 antExChuQuery1.setParentId(parentId);
780 736 antExChuQuery1.setYn(YnEnums.YES.getId());
781 737 List<AntExChuModel> data1 = antenatalExaminationService.queryAntExChu(antExChuQuery1);
782   - if (CollectionUtils.isNotEmpty(data1))
783   - {
  738 + if (CollectionUtils.isNotEmpty(data1)) {
784 739 AntExChuModel chuModel = data1.get(0);
785   - if (StringUtils.isNotEmpty(chuModel.getTireNumber()))
786   - {
787   - isTire = Integer.parseInt(chuModel.getTireNumber()) > 1 ? "是":"否";
  740 + if (StringUtils.isNotEmpty(chuModel.getTireNumber())) {
  741 + isTire = Integer.parseInt(chuModel.getTireNumber()) > 1 ? "是" : "否";
788 742 tireNumber = chuModel.getTireNumber();
789 743 }
790 744 }
791 745 map.put("isTire", isTire);
792   - map.put("tireNumber",tireNumber);
793   - map.put("viewInfo",viewInfo);
  746 + map.put("tireNumber", tireNumber);
  747 + map.put("viewInfo", viewInfo);
794 748  
795   - if (type == 3)
796   - {
797   - Map<String,Object> sieveResultInfo = new HashMap<>();
  749 + if (type == 3) {
  750 + Map<String, Object> sieveResultInfo = new HashMap<>();
798 751  
799 752 SieveResultQuery sieveResultQuery = new SieveResultQuery();
800 753 sieveResultQuery.setParentId(parentId);
801 754 sieveResultQuery.setYn(YnEnums.YES.getId());
802 755 List<SieveResultModel> list = sieveService.queryListSieveResult(sieveResultQuery);
803   - if (CollectionUtils.isNotEmpty(list))
804   - {
  756 + if (CollectionUtils.isNotEmpty(list)) {
805 757 SieveResultModel sieveResultModel = list.get(0);
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() : "");
  758 + sieveResultInfo.put("hcg", sieveResultModel.getHcg() != null ? sieveResultModel.getHcg() + "ng/ml" : "");
  759 + sieveResultInfo.put("hcgMom", sieveResultModel.getHcgMom() != null ? sieveResultModel.getHcgMom() : "");
  760 + sieveResultInfo.put("hafp", sieveResultModel.getHafp() != null ? sieveResultModel.getHafp() + "U/ml" : "");
  761 + sieveResultInfo.put("hafpMom", sieveResultModel.getHafpMom() != null ? sieveResultModel.getHafpMom() : "");
810 762 sieveResultInfo.put("examineName", CommonsHelper.getUserName(sieveResultModel.getExamineId(), usersService));
811   - sieveResultInfo.put("checkerName",CommonsHelper.getUserName(sieveResultModel.getCheckerId(), usersService));
812   - sieveResultInfo.put("reportTime",DateUtil.getyyyy_MM_dd(sieveResultModel.getResultTime()));
  763 + sieveResultInfo.put("checkerName", CommonsHelper.getUserName(sieveResultModel.getCheckerId(), usersService));
  764 + sieveResultInfo.put("reportTime", DateUtil.getyyyy_MM_dd(sieveResultModel.getResultTime()));
813 765  
814 766 String tszhzValue = "";
815   - if (StringUtils.isNotEmpty(sieveResultModel.getTszhz()) && sieveResultModel.getTszhzValue() != null && sieveResultModel.getTszhzValue().size() > 0)
816   - {
  767 + if (StringUtils.isNotEmpty(sieveResultModel.getTszhz()) && sieveResultModel.getTszhzValue() != null && sieveResultModel.getTszhzValue().size() > 0) {
817 768  
818 769 String valueOne = sieveResultModel.getTszhzValue().get("valueOne");
819 770 String valueTwo = sieveResultModel.getTszhzValue().get("valueTwo");
820   - tszhzValue = valueOne + "/"+valueTwo+("0".equals(sieveResultModel.getTszhz()) ? "低风险" : "1".equals(sieveResultModel.getTszhz()) ? "临界值" : "高风险");
  771 + tszhzValue = valueOne + "/" + valueTwo + ("0".equals(sieveResultModel.getTszhz()) ? "低风险" : "1".equals(sieveResultModel.getTszhz()) ? "临界值" : "高风险");
821 772 }
822   - sieveResultInfo.put("tszhz",tszhzValue);
  773 + sieveResultInfo.put("tszhz", tszhzValue);
823 774  
824 775  
825 776 String sbst = "";
826   - if (StringUtils.isNotEmpty(sieveResultModel.getSbst()) && sieveResultModel.getSbstValue() != null && sieveResultModel.getSbstValue().size() > 0)
827   - {
  777 + if (StringUtils.isNotEmpty(sieveResultModel.getSbst()) && sieveResultModel.getSbstValue() != null && sieveResultModel.getSbstValue().size() > 0) {
828 778  
829 779 String valueOne = sieveResultModel.getSbstValue().get("valueOne");
830 780 String valueTwo = sieveResultModel.getSbstValue().get("valueTwo");
831   - sbst = valueOne + "/"+valueTwo+("0".equals(sieveResultModel.getSbst()) ? "低风险" : "1".equals(sieveResultModel.getSbst()) ? "临界值" : "高风险");
  781 + sbst = valueOne + "/" + valueTwo + ("0".equals(sieveResultModel.getSbst()) ? "低风险" : "1".equals(sieveResultModel.getSbst()) ? "临界值" : "高风险");
832 782 }
833   - sieveResultInfo.put("sbst",sbst);
  783 + sieveResultInfo.put("sbst", sbst);
834 784  
835 785  
836   - String sjgjx = "";
837   - if (StringUtils.isNotEmpty(sieveResultModel.getSjgjx()) && sieveResultModel.getSjgjxValue() != null && sieveResultModel.getSjgjxValue().size() > 0)
838   - {
  786 + String sjgjx = "";
  787 + if (StringUtils.isNotEmpty(sieveResultModel.getSjgjx()) && sieveResultModel.getSjgjxValue() != null && sieveResultModel.getSjgjxValue().size() > 0) {
839 788  
840 789 String valueOne = sieveResultModel.getSjgjxValue().get("valueOne");
841 790 String valueTwo = sieveResultModel.getSjgjxValue().get("valueTwo");
842   - sjgjx = valueOne + "/"+valueTwo+("0".equals(sieveResultModel.getSjgjx()) ? "低风险" : "1".equals(sieveResultModel.getSjgjx()) ? "临界值" : "高风险");
  791 + sjgjx = valueOne + "/" + valueTwo + ("0".equals(sieveResultModel.getSjgjx()) ? "低风险" : "1".equals(sieveResultModel.getSjgjx()) ? "临界值" : "高风险");
843 792 }
844   - sieveResultInfo.put("sjgjx",sjgjx);
  793 + sieveResultInfo.put("sjgjx", sjgjx);
845 794  
846   - String stzhz13 = "";
847   - if (StringUtils.isNotEmpty(sieveResultModel.getStzhz13()) && sieveResultModel.getStzhz13Value() != null && sieveResultModel.getStzhz13Value().size() > 0)
848   - {
  795 + String stzhz13 = "";
  796 + if (StringUtils.isNotEmpty(sieveResultModel.getStzhz13()) && sieveResultModel.getStzhz13Value() != null && sieveResultModel.getStzhz13Value().size() > 0) {
849 797 String valueOne = sieveResultModel.getStzhz13Value().get("valueOne");
850 798 String valueTwo = sieveResultModel.getStzhz13Value().get("valueTwo");
851   - stzhz13 = valueOne + "/"+valueTwo+("0".equals(sieveResultModel.getStzhz13()) ? "低风险" : "1".equals(sieveResultModel.getStzhz13()) ? "临界值" : "高风险");
  799 + stzhz13 = valueOne + "/" + valueTwo + ("0".equals(sieveResultModel.getStzhz13()) ? "低风险" : "1".equals(sieveResultModel.getStzhz13()) ? "临界值" : "高风险");
852 800 }
853   - sieveResultInfo.put("stzhz13",stzhz13);
  801 + sieveResultInfo.put("stzhz13", stzhz13);
854 802  
855 803  
856 804 }
857   - map.put("sieveResultInfo",sieveResultInfo);
  805 + map.put("sieveResultInfo", sieveResultInfo);
858 806 }
859 807 }
860 808 }
861 809  
862 810  
863 811  
864 812  
865 813  
866 814  
867 815  
868 816  
869 817  
870 818  
871 819  
872 820  
873 821  
874 822  
... ... @@ -907,167 +855,112 @@
907 855 sieveResultEditInfo.put("examineId", model.getExamineId());
908 856 sieveResultEditInfo.put("checkerId", model.getCheckerId());
909 857 sieveResultEditInfo.put("resultTime", DateUtil.getyyyy_MM_dd(model.getResultTime()));
910   -
911 858 sieveResultEditInfo.put("tszhz", model.getTszhz());
912 859 sieveResultEditInfo.put("sbst", model.getSbst());
913 860 sieveResultEditInfo.put("stzhz13", model.getStzhz13());
914 861 sieveResultEditInfo.put("sjgjx", model.getSjgjx());
915   -
916   -
917 862 sieveResultEditInfo.put("tszhzValue", model.getTszhzValue());
918 863 sieveResultEditInfo.put("sbstValue", model.getSbstValue());
919 864 sieveResultEditInfo.put("stzhz13Value", model.getStzhz13Value());
920 865 sieveResultEditInfo.put("sjgjxValue", model.getSjgjxValue());
921 866 sieveResultEditInfo.put("publishName", model.getPublishName());
  867 + sieveResultEditInfo.put("hcg", model.getHcg() != null ? model.getHcg() + "ng/ml" : "");
  868 + sieveResultEditInfo.put("hcgMom", model.getHcgMom() != null ? model.getHcgMom() : "");
  869 + sieveResultEditInfo.put("hafp", model.getHafp() != null ? model.getHafp() + "U/ml" : "");
  870 + sieveResultEditInfo.put("hafpMom", model.getHafpMom() != null ? model.getHafpMom() : "");
  871 + sieveResultEditInfo.put("examineName", CommonsHelper.getUserName(model.getExamineId(), usersService));
  872 + sieveResultEditInfo.put("checkerName", CommonsHelper.getUserName(model.getCheckerId(), usersService));
  873 + sieveResultEditInfo.put("reportTime", DateUtil.getyyyy_MM_dd(model.getResultTime()));
  874 +
  875 + String tszhzValue = "";
  876 + if (StringUtils.isNotEmpty(model.getTszhz()) && model.getTszhzValue() != null && model.getTszhzValue().size() > 0) {
  877 + String valueOne = model.getTszhzValue().get("valueOne");
  878 + String valueTwo = model.getTszhzValue().get("valueTwo");
  879 + tszhzValue = valueOne + "/" + valueTwo + ("0".equals(model.getTszhz()) ? "低风险" : "1".equals(model.getTszhz()) ? "临界值" : "高风险");
  880 + }
  881 + sieveResultEditInfo.put("tszhz", tszhzValue);
  882 +
  883 + String sbst = "";
  884 + if (StringUtils.isNotEmpty(model.getSbst()) && model.getSbstValue() != null && model.getSbstValue().size() > 0) {
  885 +
  886 + String valueOne = model.getSbstValue().get("valueOne");
  887 + String valueTwo = model.getSbstValue().get("valueTwo");
  888 + sbst = valueOne + "/" + valueTwo + ("0".equals(model.getSbst()) ? "低风险" : "1".equals(model.getSbst()) ? "临界值" : "高风险");
  889 + }
  890 + sieveResultEditInfo.put("sbst", sbst);
  891 +
  892 +
  893 + String sjgjx = "";
  894 + if (StringUtils.isNotEmpty(model.getSjgjx()) && model.getSjgjxValue() != null && model.getSjgjxValue().size() > 0) {
  895 +
  896 + String valueOne = model.getSjgjxValue().get("valueOne");
  897 + String valueTwo = model.getSjgjxValue().get("valueTwo");
  898 + sjgjx = valueOne + "/" + valueTwo + ("0".equals(model.getSjgjx()) ? "低风险" : "1".equals(model.getSjgjx()) ? "临界值" : "高风险");
  899 + }
  900 + sieveResultEditInfo.put("sjgjx", sjgjx);
  901 + String stzhz13 = "";
  902 + if (StringUtils.isNotEmpty(model.getStzhz13()) && model.getStzhz13Value() != null && model.getStzhz13Value().size() > 0) {
  903 + String valueOne = model.getStzhz13Value().get("valueOne");
  904 + String valueTwo = model.getStzhz13Value().get("valueTwo");
  905 + stzhz13 = valueOne + "/" + valueTwo + ("0".equals(model.getStzhz13()) ? "低风险" : "1".equals(model.getStzhz13()) ? "临界值" : "高风险");
  906 + }
  907 + sieveResultEditInfo.put("stzhz13", stzhz13);
922 908 }
923 909 map.put("sieveResultEditInfo", sieveResultEditInfo);
924 910 } else {//查看申请单
925 911 List<SieveApplyOrderModel> sieveApplyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1);
926 912 if (CollectionUtils.isNotEmpty(sieveApplyOrderModels)) {
927 913 Map<String, Object> result = new HashMap<>();
928   -
929   - Map<String, Object> viewInfo = new HashMap<>();
930 914 SieveApplyOrderModel sieveApply = sieveApplyOrderModels.get(0);
931 915  
932   - result.put("id", sieveApply.getId());
933   - result.put("parentId", sieveApply.getParentId());
934   -
935   - result.put("check", sieveApply.getCheckItem());
936   - result.put("guide", sieveApply.getGuide());
937   - result.put("checkDate", sieveApply.getCheckDate());
938   - result.put("applyDoctor", sieveApply.getApplyDoctor());
939   - result.put("hospitalId", sieveApply.getHospitalId());
940   - result.put("applyTime", DateUtil.getyyyy_MM_dd(sieveApply.getApplyTime()));
941   - result.put("birth", DateUtil.getyyyy_MM_dd(sieveApply.getBirth()));
942 916 result.put("weight", sieveApply.getWeight());
943   - result.put("lastMenses", DateUtil.getyyyy_MM_dd(sieveApply.getLastMenses()));
944   - result.put("number", sieveApply.getNumber());
945   - result.put("collectionDoctorId", sieveApply.getCollectionDoctorId());
946   - result.put("collectionDate", DateUtil.getyyyy_MM_dd(sieveApply.getCollectionDate()));
947   - result.put("crl", sieveApply.getCrl());
948   - result.put("bpd", sieveApply.getBpd());
949   - result.put("bcCheckDate", DateUtil.getyyyy_MM_dd(sieveApply.getBcCheckDate()));
950   - result.put("historyBirth", sieveApply.getHistoryBirth());
951   - result.put("pastHistory", sieveApply.getPastHistory());
952   - result.put("sieveHospitalId", sieveApply.getSieveHospitalId());
953   - result.put("sendDoctor", sieveApply.getSendDoctor());
954   - result.put("sendTime", DateUtil.getyyyy_MM_dd(sieveApply.getSendTime()));
  917 + result.put("lastMenstr", DateUtil.getyyyy_MM_dd(sieveApply.getLastMenses()));
  918 + result.put("bbh", sieveApply.getNumber());
  919 + result.put("cxys", sieveApply.getCollectionDoctorId());//采集医生
  920 + result.put("cxrq", DateUtil.getyyyy_MM_dd(sieveApply.getCollectionDate()));//采血日期
  921 + result.put("sjys", sieveApply.getSendDoctor());//送检医生
  922 + result.put("sjrq", DateUtil.getyyyy_MM_dd(sieveApply.getSendTime()));//送检日期
955 923 result.put("age", DateUtil.getAge(sieveApply.getBirth(), sieveApply.getCreated()));
956   - result.put("mensesDay", sieveApply.getMensesDay());
957   - result.put("mensesWeek", sieveApply.getMensesWeek());
958   - result.put("experimentNum", "");
  924 + result.put("menstrWeek", sieveApply.getMensesWeek());//月经周
  925 + result.put("historyBirth", sieveApply.getHistoryBirth());//生育史
959 926  
960   - map.put("sieveApplyInfo", result);
  927 + String collectionDoctorName = CommonsHelper.getUserName(sieveApply.getCollectionDoctorId(), usersService);
  928 + result.put("cxys", collectionDoctorName);
961 929  
962   - if (type == 1) {
963   - String applyDoctorName = CommonsHelper.getUserName(sieveApply.getApplyDoctor(), usersService);
964   - viewInfo.put("applyDoctorName", applyDoctorName);
  930 + String sendDoctorName = CommonsHelper.getUserName(sieveApply.getSendDoctor(), usersService);
  931 + result.put("sjys", sendDoctorName);
965 932  
966   - String collectionDoctorName = CommonsHelper.getUserName(sieveApply.getCollectionDoctorId(), usersService);
967   - viewInfo.put("collectionDoctorName", collectionDoctorName);
968   -
969   - String sendDoctorName = CommonsHelper.getUserName(sieveApply.getSendDoctor(), usersService);
970   - viewInfo.put("sendDoctorName", sendDoctorName);
971   -
972   - String applyHospitalName = CommonsHelper.getHospitalName(sieveApply.getSieveHospitalId(), organizationService);
973   - viewInfo.put("applyHospitalName", applyHospitalName);
974   -
975   - String currentHospitalName = CommonsHelper.getHospitalName(sieveApply.getHospitalId(), organizationService);
976   - viewInfo.put("currentHospitalName", currentHospitalName);
977   -
978   - String isTire = "";
979   - String tireNumber = "";
980   - AntExChuQuery antExChuQuery1 = new AntExChuQuery();
981   - antExChuQuery1.setParentId(parentId);
982   - antExChuQuery1.setYn(YnEnums.YES.getId());
983   - List<AntExChuModel> data1 = antenatalExaminationService.queryAntExChu(antExChuQuery1);
984   - if (CollectionUtils.isNotEmpty(data1)) {
985   - AntExChuModel chuModel = data1.get(0);
986   - if (StringUtils.isNotEmpty(chuModel.getTireNumber())) {
987   - isTire = Integer.parseInt(chuModel.getTireNumber()) > 1 ? "是" : "否";
988   - tireNumber = chuModel.getTireNumber();
989   - }
  933 + String isTire = "否";
  934 + AntExChuQuery antExChuQuery1 = new AntExChuQuery();
  935 + antExChuQuery1.setParentId(parentId);
  936 + antExChuQuery1.setYn(YnEnums.YES.getId());
  937 + List<AntExChuModel> data1 = antenatalExaminationService.queryAntExChu(antExChuQuery1);
  938 + if (CollectionUtils.isNotEmpty(data1)) {
  939 + AntExChuModel chuModel = data1.get(0);
  940 + if (StringUtils.isNotEmpty(chuModel.getTireNumber())) {
  941 + isTire = Integer.parseInt(chuModel.getTireNumber()) > 1 ? "是" : "否";
990 942 }
991   - map.put("isTire", isTire);
992   - map.put("tireNumber", tireNumber);
993   - map.put("viewInfo", viewInfo);
994   -
995   - Map<String, Object> sieveResultInfo = new HashMap<>();
996   -
997   - SieveResultQuery sieveResultQuery = new SieveResultQuery();
998   - sieveResultQuery.setParentId(parentId);
999   - sieveResultQuery.setYn(YnEnums.YES.getId());
1000   - List<SieveResultModel> list = sieveService.queryListSieveResult(sieveResultQuery);
1001   - if (CollectionUtils.isNotEmpty(list)) {
1002   - SieveResultModel sieveResultModel = list.get(0);
1003   - sieveResultInfo.put("hcg", sieveResultModel.getHcg() != null ? sieveResultModel.getHcg() + "ng/ml" : "");
1004   - sieveResultInfo.put("hcgMom", sieveResultModel.getHcgMom() != null ? sieveResultModel.getHcgMom() : "");
1005   - sieveResultInfo.put("hafp", sieveResultModel.getHafp() != null ? sieveResultModel.getHafp() + "U/ml" : "");
1006   - sieveResultInfo.put("hafpMom", sieveResultModel.getHafpMom() != null ? sieveResultModel.getHafpMom() : "");
1007   - sieveResultInfo.put("examineName", CommonsHelper.getUserName(sieveResultModel.getExamineId(), usersService));
1008   - sieveResultInfo.put("checkerName", CommonsHelper.getUserName(sieveResultModel.getCheckerId(), usersService));
1009   - sieveResultInfo.put("reportTime", DateUtil.getyyyy_MM_dd(sieveResultModel.getResultTime()));
1010   -
1011   - String tszhzValue = "";
1012   - if (StringUtils.isNotEmpty(sieveResultModel.getTszhz()) && sieveResultModel.getTszhzValue() != null && sieveResultModel.getTszhzValue().size() > 0) {
1013   -
1014   - String valueOne = sieveResultModel.getTszhzValue().get("valueOne");
1015   - String valueTwo = sieveResultModel.getTszhzValue().get("valueTwo");
1016   - tszhzValue = valueOne + "/" + valueTwo + ("0".equals(sieveResultModel.getTszhz()) ? "低风险" : "1".equals(sieveResultModel.getTszhz()) ? "临界值" : "高风险");
1017   - }
1018   - sieveResultInfo.put("tszhz", tszhzValue);
1019   -
1020   -
1021   - String sbst = "";
1022   - if (StringUtils.isNotEmpty(sieveResultModel.getSbst()) && sieveResultModel.getSbstValue() != null && sieveResultModel.getSbstValue().size() > 0) {
1023   -
1024   - String valueOne = sieveResultModel.getSbstValue().get("valueOne");
1025   - String valueTwo = sieveResultModel.getSbstValue().get("valueTwo");
1026   - sbst = valueOne + "/" + valueTwo + ("0".equals(sieveResultModel.getSbst()) ? "低风险" : "1".equals(sieveResultModel.getSbst()) ? "临界值" : "高风险");
1027   - }
1028   - sieveResultInfo.put("sbst", sbst);
1029   -
1030   -
1031   - String sjgjx = "";
1032   - if (StringUtils.isNotEmpty(sieveResultModel.getSjgjx()) && sieveResultModel.getSjgjxValue() != null && sieveResultModel.getSjgjxValue().size() > 0) {
1033   -
1034   - String valueOne = sieveResultModel.getSjgjxValue().get("valueOne");
1035   - String valueTwo = sieveResultModel.getSjgjxValue().get("valueTwo");
1036   - sjgjx = valueOne + "/" + valueTwo + ("0".equals(sieveResultModel.getSjgjx()) ? "低风险" : "1".equals(sieveResultModel.getSjgjx()) ? "临界值" : "高风险");
1037   - }
1038   - sieveResultInfo.put("sjgjx", sjgjx);
1039   -
1040   - String stzhz13 = "";
1041   - if (StringUtils.isNotEmpty(sieveResultModel.getStzhz13()) && sieveResultModel.getStzhz13Value() != null && sieveResultModel.getStzhz13Value().size() > 0) {
1042   - String valueOne = sieveResultModel.getStzhz13Value().get("valueOne");
1043   - String valueTwo = sieveResultModel.getStzhz13Value().get("valueTwo");
1044   - stzhz13 = valueOne + "/" + valueTwo + ("0".equals(sieveResultModel.getStzhz13()) ? "低风险" : "1".equals(sieveResultModel.getStzhz13()) ? "临界值" : "高风险");
1045   - }
1046   - sieveResultInfo.put("stzhz13", stzhz13);
1047   - }
1048   - map.put("sieveResultInfo", sieveResultInfo);
  943 + result.put("embryoNum", chuModel.getTireNumber());
  944 + result.put("lastMenstr", chuModel.getLastMenses());
  945 + result.put("polyember", isTire);
1049 946 }
1050 947 }
1051 948 baseResponse.setObject(map);
1052 949 }
1053   -
1054 950 return baseResponse;
1055   - }
  951 +}
1056 952  
1057 953 public BaseResponse reviceSieve(List<String> parentIds, Integer userId) {
1058 954 String hospitalId = autoMatchFacade.getHospitalId(userId);
1059   - if (CollectionUtils.isNotEmpty(parentIds))
1060   - {
  955 + if (CollectionUtils.isNotEmpty(parentIds)) {
1061 956 SieveQuery query = new SieveQuery();
1062 957 query.setParentIds(parentIds);
1063 958 query.setYn(YnEnums.YES.getId());
1064 959 query.setApplyHospitalId(hospitalId);
1065 960 List<SieveModel> list = sieveService.queryList(query);
1066 961  
1067   - if (CollectionUtils.isNotEmpty(list))
1068   - {
1069   - for (SieveModel sieve : list)
1070   - {
  962 + if (CollectionUtils.isNotEmpty(list)) {
  963 + for (SieveModel sieve : list) {
1071 964 sieve.setReviceStatus(2);
1072 965 sieveService.updateOneChanQianDiaSieve(sieve);
1073 966 }