Commit eadbfd076f60b18bad0cd60edf33349dc360f9a6

Authored by wtt
1 parent db09b5dbf5

update

Showing 2 changed files with 16 additions and 3 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java View file @ eadbfd0
... ... @@ -518,7 +518,10 @@
518 518 bSieve.setXscsjg("4");
519 519 }
520 520 bSieve.setXsresultJSON(jsonObjectData.toString()); //检查详细存储起来
  521 + bSieve.setSieveStatuseNw("3");
521 522 babySieveQhdService.updateBabySieveById(bSieve, babySieveQhdModel.getId());
  523 + updateBabyBuildSieve(babySieveQhdModel, bSieve);
  524 +
522 525 }
523 526 }else {
524 527 operateLogFacade.addModifyOptLog(null, Integer.valueOf(babySieveQhdModel.getHospitalId()),babySieveQhdModel, jsonObject, OptActionEnums.ADD.getId(), "新筛四病结果异常");
525 528  
... ... @@ -548,7 +551,9 @@
548 551 bSieve.setClcsjg(patien.get("status2").toString());
549 552 }
550 553 bSieve.setClresultJSON(jsonObjectData.toString()); //检查详细存储起来
  554 + bSieve.setSieveStatuseNw("3");
551 555 babySieveQhdService.updateBabySieveById(bSieve, babySieveQhdModel.getId());
  556 + updateBabyBuildSieve(babySieveQhdModel, bSieve);
552 557 }
553 558 }else {
554 559 operateLogFacade.addModifyOptLog(null, Integer.valueOf(babySieveQhdModel.getHospitalId()),babySieveQhdModel, jsonObject, OptActionEnums.ADD.getId(), "串联质谱结果异常");
... ... @@ -560,6 +565,14 @@
560 565 }
561 566 }
562 567  
  568 + private void updateBabyBuildSieve(BabySieveQhdModel babySieveQhdModel, BabySieveQhdModel bSieve) {
  569 + BabyModel model = new BabyModel();
  570 + model.setXscsjg(bSieve.getXscsjg());
  571 + model.setClcsjg(bSieve.getClcsjg());
  572 + model.setSieveStatuseNw(bSieve.getSieveStatuseNw());
  573 + babyBookbuildingService.updateBabyBuild(model, babySieveQhdModel.getBabyId());
  574 + }
  575 +
563 576 /**
564 577 * 儿童筛查保存 同步到对方系统 秦皇岛
565 578 *
... ... @@ -661,8 +674,8 @@
661 674 model.setMsTiaoXingMa(babySieveAddQhdRequest.getMsTiaoXingMa());//串联血卡编号:
662 675  
663 676 model.setSieveStatuseNwXy(babySieveAddQhdRequest.getSieveStatuseNwXy()); //血样状态 1合格 2不合格
664   - model.setXscsjg(babySieveAddQhdRequest.getXscsjg());//新筛四项筛查结果(1阳性、2阴性):
665   - model.setClcsjg(babySieveAddQhdRequest.getClcsjg());//串联质谱筛查结果(1阳性、2阴性):
  677 + model.setXscsjg(babySieveAddQhdRequest.getXscsjg());//新筛四项筛查结果(1阳性、2阴性 4召回)
  678 + model.setClcsjg(babySieveAddQhdRequest.getClcsjg());//串联质谱筛查结果(1阳性、2阴性 4召回 6临床确诊)
666 679  
667 680 model.setPay_type(babySieveAddQhdRequest.getPay_type());//两病支付方式(1自费、2免费)
668 681 model.setClzffs(babySieveAddQhdRequest.getClzffs());//串联支付方式(1自费、2免费)
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabySieveAddQhdRequest.java View file @ eadbfd0
... ... @@ -37,7 +37,7 @@
37 37 /*儿童信息*/
38 38 /*
39 39 筛查状态 null || 0:待申请(操作:空),1:已申请(操作:修改筛查信息,查看申请单),
40   - 2:已接收 + 1合格 =(操作:查看申请单), + 2不合格(操作:修改筛查信息,查看申请单)
  40 + //2:已接收 + 1合格 =(操作:查看申请单), + 2不合格(操作:修改筛查信息,查看申请单)
41 41 3:有结果(操作:查看结果)
42 42 */
43 43 private String sieveStatuseNw;