diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java index 0658656..dcdf7e0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java @@ -518,7 +518,10 @@ public class BabySieveFacede { bSieve.setXscsjg("4"); } bSieve.setXsresultJSON(jsonObjectData.toString()); //检查详细存储起来 + bSieve.setSieveStatuseNw("3"); babySieveQhdService.updateBabySieveById(bSieve, babySieveQhdModel.getId()); + updateBabyBuildSieve(babySieveQhdModel, bSieve); + } }else { operateLogFacade.addModifyOptLog(null, Integer.valueOf(babySieveQhdModel.getHospitalId()),babySieveQhdModel, jsonObject, OptActionEnums.ADD.getId(), "新筛四病结果异常"); @@ -548,7 +551,9 @@ public class BabySieveFacede { bSieve.setClcsjg(patien.get("status2").toString()); } bSieve.setClresultJSON(jsonObjectData.toString()); //检查详细存储起来 + bSieve.setSieveStatuseNw("3"); babySieveQhdService.updateBabySieveById(bSieve, babySieveQhdModel.getId()); + updateBabyBuildSieve(babySieveQhdModel, bSieve); } }else { operateLogFacade.addModifyOptLog(null, Integer.valueOf(babySieveQhdModel.getHospitalId()),babySieveQhdModel, jsonObject, OptActionEnums.ADD.getId(), "串联质谱结果异常"); @@ -560,6 +565,14 @@ public class BabySieveFacede { } } + private void updateBabyBuildSieve(BabySieveQhdModel babySieveQhdModel, BabySieveQhdModel bSieve) { + BabyModel model = new BabyModel(); + model.setXscsjg(bSieve.getXscsjg()); + model.setClcsjg(bSieve.getClcsjg()); + model.setSieveStatuseNw(bSieve.getSieveStatuseNw()); + babyBookbuildingService.updateBabyBuild(model, babySieveQhdModel.getBabyId()); + } + /** * 儿童筛查保存 同步到对方系统 秦皇岛 * @@ -661,8 +674,8 @@ public class BabySieveFacede { model.setMsTiaoXingMa(babySieveAddQhdRequest.getMsTiaoXingMa());//串联血卡编号: model.setSieveStatuseNwXy(babySieveAddQhdRequest.getSieveStatuseNwXy()); //血样状态 1合格 2不合格 - model.setXscsjg(babySieveAddQhdRequest.getXscsjg());//新筛四项筛查结果(1阳性、2阴性): - model.setClcsjg(babySieveAddQhdRequest.getClcsjg());//串联质谱筛查结果(1阳性、2阴性): + model.setXscsjg(babySieveAddQhdRequest.getXscsjg());//新筛四项筛查结果(1阳性、2阴性 4召回) + model.setClcsjg(babySieveAddQhdRequest.getClcsjg());//串联质谱筛查结果(1阳性、2阴性 4召回 6临床确诊) model.setPay_type(babySieveAddQhdRequest.getPay_type());//两病支付方式(1自费、2免费) model.setClzffs(babySieveAddQhdRequest.getClzffs());//串联支付方式(1自费、2免费) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabySieveAddQhdRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabySieveAddQhdRequest.java index 031d452..183c216 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabySieveAddQhdRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabySieveAddQhdRequest.java @@ -37,7 +37,7 @@ public class BabySieveAddQhdRequest implements IBasicRequestConvert