From f70cc41bb239033670f7c127bb9b1f7883ebb8b6 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 24 Apr 2020 14:26:08 +0800 Subject: [PATCH] update --- .../operate/web/facade/ApplyOrderFacade.java | 75 +++++++++++++++++++--- .../request/HuadaSieveApplyOrderAddRequest.java | 36 +++++++++-- 2 files changed, 96 insertions(+), 15 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index e88ed17..5aca4db 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -528,20 +528,12 @@ public class ApplyOrderFacade { sieveService.updateOneChanQianDiaSieve(sieveModel); operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), sieveModels.get(0), sieveModel, OptActionEnums.UPDATE.getId(), "增加产前筛查"); } - // 调用华大接口 - System.out.println("debug=========>开始调用华大接口"); + // 调用华大接口 Boolean aBoolean = callHuaDa(sieveApplyOrderModel, hospitalId); String number = sieveApplyOrderModel.getNumber(); if (aBoolean != null && StringUtils.isNotEmpty(number)) { mongoTemplate.updateFirst(Query.query(Criteria.where("number").is(number)), Update.update("huaDaPushResult", aBoolean), SieveApplyOrderModel.class); } - System.out.println("debug=========>结束调用华大接口"); - // } else { - // return new BaseResponse().setErrorcode(ErrorCodeConstants.DATA_EXIST).setErrormsg("已申请过产筛"); - // } - - - return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } @@ -718,6 +710,69 @@ public class ApplyOrderFacade { request.setNativePlace(addressRegister); + + + + + if (StringUtils.isNotEmpty(sieveApplyOrderModel.getUltrasonicNtWeek())) + { + //nt测定孕周 + request.setNtGestationalWeeks(sieveApplyOrderModel.getUltrasonicNtWeek().replace("周","w").replace("天","")); + } + + + request.setGravidity(sieveApplyOrderModel.getYunSize()); + request.setParity(sieveApplyOrderModel.getChanSize()); + request.setBirthDate(DateUtil.getyyyy_MM_dd(patients.getBirth())); + request.setNtValue(sieveApplyOrderModel.getUltrasonicNtVal()); + //0/高风险 1/低风险 2/临界风险 + String srisk = sieveApplyOrderModel.getSerumScreeningRisk(); + if (StringUtils.isNotEmpty(srisk)) + { + int week = DateUtil.getWeek(patients.getLastMenses(),new Date()); + if (week < 13) + { + //0：母血清筛查风险率‐高风险 1：母血清筛查风险率‐临界风险 2：母血清筛查风险率‐低风险 + request.setMotherSerumRisk("0".equals(srisk) ? "0" : ("1".equals(srisk) ? "2" : "1")); + //早期 + request.setTrisomy21(sieveApplyOrderModel.getSyndrome21()); + request.setTrisomy18(sieveApplyOrderModel.getSyndrome18()); + } + else + { + //0：母血清筛查风险率‐高风险 1：母血清筛查风险率‐临界风险 2：母血清筛查风险率‐低风险 + request.setMmotherSerumRisk("0".equals(srisk) ? "0" : ("1".equals(srisk) ? "2" : "1")); + //中期 + request.setMtrisomy21(sieveApplyOrderModel.getSyndrome21()); + request.setMtrisomy18(sieveApplyOrderModel.getSyndrome18()); + } + + } + + //居住地 + String liveAddress = CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), + patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService); + //联系地址 + request.setSampleRecipientEmail(liveAddress); + + request.setHusbandPhoneNum(patients.getHusbandPhone()); + if (org.apache.commons.lang.StringUtils.isNotEmpty(sieveApplyOrderModel.getApplyDoctor())) { + if (NumberUtils.isNumber(sieveApplyOrderModel.getApplyDoctor())) { + Users users = usersService.getUsers(NumberUtils.toInt(sieveApplyOrderModel.getApplyDoctor())); + if (null != users) { + request.setDoctorName(users.getName()); + } + } + } + //家族史 + request.setFamilyProduce(sieveApplyOrderModel.getJzsInfo()); + //不良孕产史 + request.setAbnormalPregnancyHistory(sieveApplyOrderModel.getBadMaternalHistory()); + + +// request.put("pcountry", getBasicConfig(patients.getPcountryId())); +// map.put("pnation", getBasicConfig(patients.getPnationId())); + if ("4".equals(HIS_VERSION)) { result = huadaSaveSampleInfo(request); @@ -1739,7 +1794,7 @@ public class ApplyOrderFacade { return true; } } catch (Exception e) { - e.printStackTrace(); + ExceptionUtils.catchException(e,"error"); } return false; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/HuadaSieveApplyOrderAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/HuadaSieveApplyOrderAddRequest.java index beb6413..456f42e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/HuadaSieveApplyOrderAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/HuadaSieveApplyOrderAddRequest.java @@ -45,15 +45,14 @@ public class HuadaSieveApplyOrderAddRequest { private String sampleRecipientEmail; private String pregnancy; //0：本次妊娠方式-自然受孕 1：本次妊娠方式-促排卵 2：本次妊娠方式-宫内人工受精 private String adosculation;//是否是否体外受精-胚胎移植（IVF） 0：是否IVF-否 1：是否IVF-是 - private String gravidity; - private String parity; + private String familyProduce; private String abnormalPregnancyHistory; private String naturalAbortionNum; private String stillbirthNum; private String neonatalDeathNum; private String oafNum; - private String ntd; + private String ntd;//0：神经管缺陷筛查‐未做 1：神经管缺陷筛查‐已做（高风险） 2：神经管缺陷筛查‐已做（低风险） private String gravidaKaryotype; private String husbandKaryotype; private String allogeneticTransfusion;// 既往史: 一年内异体输血 0：既往史: 一年内异体输血-无 1：既往史: 一年内异体输血-有（不接受） @@ -64,18 +63,45 @@ public class HuadaSieveApplyOrderAddRequest { private String btypeUltrasonic;//辅助检查(B超结果) private String ultrasonography; private String screeningModel;//其他辅助筛查，页面传入什么输入 - private String motherSerumRisk; + private String motherSerumRisk;//早期 + private String mmotherSerumRisk;//中期 private String mtrisomy21; private String mtrisomy18; private String trisomy21; private String trisomy18; - private String ntGestationalWeeks; + private String ntValue; private String bscanRemark; private String intervenTional; private String intervenTionalOtherDesc; private String nativePlace;// 户籍地址 + //生日 + private String birthDate; + //孕‐次 + private String gravidity; + //产‐次 + private String parity; + //nt测定孕周 + private String ntGestationalWeeks; + + + public String getMmotherSerumRisk() { + return mmotherSerumRisk; + } + + public void setMmotherSerumRisk(String mmotherSerumRisk) { + this.mmotherSerumRisk = mmotherSerumRisk; + } + + public String getBirthDate() { + return birthDate; + } + + public void setBirthDate(String birthDate) { + this.birthDate = birthDate; + } + public String getNativePlace() { return nativePlace; } -- 1.8.3.1