From b9195b891f5b15fb829e25a41e03363f8e5fc3ad Mon Sep 17 00:00:00 2001 From: wtt Date: Wed, 9 Dec 2020 14:38:57 +0800 Subject: [PATCH] update --- .../operate/web/facade/BabySieveFacede.java | 57 ++++++++++++++-------- 1 file changed, 38 insertions(+), 19 deletions(-) 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 b04f786..6094dd9 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 @@ -74,9 +74,11 @@ public class BabySieveFacede { @Autowired private UsersService usersService; - private static final String XS_SAVE = "http://121.22.16.246:8091/MSMS/lyms/xs_save.do";//秦皇岛 新筛四项样本录入接口 - private static final String MSMS_SAVE = "http://121.22.16.246:8091/MSMS/lyms/msms_save.do";//秦皇岛 串联质谱样本录入接口 + private static final String XS_SAVE = "http://121.22.16.246:8091/MSMS/lyms/xs_save.do";//秦皇岛 新筛四项样本添加 + private static final String MSMS_SAVE = "http://121.22.16.246:8091/MSMS/lyms/msms_save.do";//秦皇岛 串联质谱样本添加 + private static final String XS_UPDATE = "http://121.22.16.246:8091/MSMS/lyms/xs_update.do";//秦皇岛 新筛四项样本更新 + private static final String MSMS_UPDATE = "http://121.22.16.246:8091/MSMS/lyms/msms_update.do";//秦皇岛 串联质谱样本更新 /** * 新生儿筛查申请前，查询孕妇是否在本院建档以及是否已经录入分娩记录 * @@ -422,6 +424,7 @@ public class BabySieveFacede { babySieveQhdService.updateBabySieveById(babySieveQhdModel, babySieveAddQhdRequest.getId()); BabyModel babyModel = convertSieveQhdBaby(babySieveAddQhdRequest, userId, babySieveQhdModel); babyBookbuildingService.updateBabyBuild(babyModel, babySieveQhdModel.getBabyId()); + addOrUpdateBabySc(userId, babySieveQhdModel, hospital,"update"); } BaseObjectResponse objectResponse = new BaseObjectResponse(); objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); @@ -440,7 +443,7 @@ public class BabySieveFacede { babyModel.setSieveStatuseNw("1"); babyBookbuildingService.updateBabyBuild(babyModel, babySieveQhdModel.getBabyId()); //儿童筛查保存 同步到对方系统 秦皇岛 - updateBabysc(userId, babySieveQhdModel, hospital); + addOrUpdateBabySc(userId, babySieveQhdModel, hospital,"add"); } BaseObjectResponse objectResponse = new BaseObjectResponse(); objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); @@ -462,7 +465,7 @@ public class BabySieveFacede { * @Author: 武涛涛 * @Date: 2020/12/8 15:11 */ - private void updateBabysc(Integer userId, BabySieveQhdModel babySieveQhdModel, String hospital) { + private void addOrUpdateBabySc(Integer userId, BabySieveQhdModel babySieveQhdModel, String hospital, String state) { Map map = new HashMap (); map.put("sign", "774856af6fc8bbaaf00705886d512fe2"); map.put("pid", "1553"); @@ -499,22 +502,38 @@ public class BabySieveFacede { map.put("pay_type", "dis_free"); } map.put("idcard", babySieveQhdModel.getIdcard()); - if(StringUtils.isNotEmpty(babySieveQhdModel.getXsTiaoXingMa())){ - //新筛四项 - map.put("testItem", babySieveQhdModel.getTestItem()); - map.put("xsTiaoXingMa", babySieveQhdModel.getXsTiaoXingMa()); - String xs = HttpClientUtil.doGet(XS_SAVE, map, "utf-8", null); - operateLogFacade.addModifyOptLog(userId, Integer.valueOf(hospital), map, xs, OptActionEnums.ADD.getId(), "保存儿童筛查新筛四项"); - } - if(StringUtils.isNotEmpty(babySieveQhdModel.getMsTiaoXingMa())){ - //串联质谱样 - map.put("msms", babySieveQhdModel.getMsms()); - map.put("msTiaoXingMa", babySieveQhdModel.getMsTiaoXingMa()); - map.remove("testItem"); - map.remove("xsTiaoXingMa"); - String cl = HttpClientUtil.doGet(MSMS_SAVE, map, "utf-8", null); - operateLogFacade.addModifyOptLog(userId, Integer.valueOf(hospital), map, cl, OptActionEnums.ADD.getId(), "保存儿童筛查串联质谱样"); + if("add".equals(state)){ + if(StringUtils.isNotEmpty(babySieveQhdModel.getXsTiaoXingMa())){ + map.put("testItem", babySieveQhdModel.getTestItem()); + map.put("xsTiaoXingMa", babySieveQhdModel.getXsTiaoXingMa()); + String xs = HttpClientUtil.doGet(XS_SAVE, map, "utf-8", null); + operateLogFacade.addModifyOptLog(userId, Integer.valueOf(hospital), map, xs, OptActionEnums.ADD.getId(), "保存儿童筛查新筛四项"); + } + if(StringUtils.isNotEmpty(babySieveQhdModel.getMsTiaoXingMa())){ + map.put("msms", babySieveQhdModel.getMsms()); + map.put("msTiaoXingMa", babySieveQhdModel.getMsTiaoXingMa()); + map.remove("testItem"); + map.remove("xsTiaoXingMa"); + String cl = HttpClientUtil.doGet(MSMS_SAVE, map, "utf-8", null); + operateLogFacade.addModifyOptLog(userId, Integer.valueOf(hospital), map, cl, OptActionEnums.ADD.getId(), "保存儿童筛查串联质谱样"); + } + }else if("update".equals(state)){ + if(StringUtils.isNotEmpty(babySieveQhdModel.getXsTiaoXingMa())){ + map.put("xsTiaoXingMa", babySieveQhdModel.getXsTiaoXingMa()); + String xs = HttpClientUtil.doGet(XS_UPDATE, map, "utf-8", null); + operateLogFacade.addModifyOptLog(userId, Integer.valueOf(hospital), map, xs, OptActionEnums.UPDATE.getId(), "修改儿童筛查新筛四项"); + } + if(StringUtils.isNotEmpty(babySieveQhdModel.getMsTiaoXingMa())){ + map.put("msTiaoXingMa", babySieveQhdModel.getMsTiaoXingMa()); + map.remove("xsTiaoXingMa"); + String cl = HttpClientUtil.doGet(MSMS_UPDATE, map, "utf-8", null); + operateLogFacade.addModifyOptLog(userId, Integer.valueOf(hospital), map, cl, OptActionEnums.UPDATE.getId(), "修改儿童筛查串联质谱样"); + } } + + + + } /** -- 1.8.3.1