diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java index 4398f3d..3ef81e3 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java @@ -110,23 +110,23 @@ public class SieveApplyOrderModel extends BaseModel { private String chanSize; /** - * 天然受孕 1/是 2/否 + * 天然受孕 1/是 0/否 */ private String imprenation; /** - * 促排卵 1/是 2/否 + * 促排卵 1/是 0/否 */ private String ovulationInduction; /** - * iui 1/是 2/否 + * iui 1/是 0/否 */ private String iui; /** - * ivf 1/是 2/否 + * ivf 1/是 0/否 */ private String ivf; @@ -136,7 +136,7 @@ public class SieveApplyOrderModel extends BaseModel { private String clinicalDiagnosis; /** - * 胎数 1/单胎 2/双胎 3/多胎 4/异常 + * 胎数 0/单胎 1/双胎 2/多胎 3/异常 */ private String fetusNum; @@ -161,7 +161,7 @@ public class SieveApplyOrderModel extends BaseModel { private String ultrasonicNtVal; /** - * 血清筛查风险 1/高风险 2/低风险 3/临界风险 + * 血清筛查风险 0/高风险 1/低风险 2/临界风险 */ private String serumScreeningRisk; @@ -176,7 +176,7 @@ public class SieveApplyOrderModel extends BaseModel { private String syndrome18; /** - * 孕妇染色体核型 1/未做 2/正常 3/异常 + * 孕妇染色体核型 0/未做 1/正常 2/异常 */ private String yfrsthx; @@ -186,7 +186,7 @@ public class SieveApplyOrderModel extends BaseModel { private String yfrsthxAbnormalInfo; /** - * 丈夫染色体核型 1/未做 2/正常 3/异常 + * 丈夫染色体核型 0/未做 1/正常 2/异常 */ private String zfrsthx; @@ -196,7 +196,7 @@ public class SieveApplyOrderModel extends BaseModel { private String zfrsthxAbnormalInfo; /** - * 不良孕产史 1/无 2/有 + * 不良孕产史 1/是 0/否 */ private String badMaternalHistory; 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 0bc2951..40ea457 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 @@ -677,6 +677,26 @@ public class ApplyOrderFacade { request.setBodyWeight(sieveApplyOrderModel.getWeight()); request.setSurgicalTransplantation(sieveApplyOrderModel.getYzss()); + request.setGravidaKaryotype(sieveApplyOrderModel.getYfrsthx()); + request.setHusbandKaryotype(sieveApplyOrderModel.getZfrsthx()); + + //本次妊娠情况 + String pregnancy = null; + if (StringUtils.isNotEmpty(sieveApplyOrderModel.getImprenation()) && "1".equals(sieveApplyOrderModel.getImprenation())) + { + pregnancy = "0"; + } + else if (StringUtils.isNotEmpty(sieveApplyOrderModel.getOvulationInduction()) && "1".equals(sieveApplyOrderModel.getOvulationInduction())) + { + pregnancy = "1"; + } + else if (StringUtils.isNotEmpty(sieveApplyOrderModel.getIui()) && "1".equals(sieveApplyOrderModel.getIui())) + { + pregnancy = "2"; + } + request.setPregnancy(pregnancy); + + huadaSaveSampleInfo(request); } // } 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 bc405f9..06f3690 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 @@ -44,7 +44,7 @@ public class HuadaSieveApplyOrderAddRequest { private String doctorName; private String hosptialNum; private String sampleRecipientEmail; - private String pregnancy; + private String pregnancy; //0:本次妊娠方式-自然受孕 1:本次妊娠方式-促排卵 2:本次妊娠方式-宫内人工受精 private String adosculation;//是否是否体外受精-胚胎移植(IVF) 0:是否IVF-否 1:是否IVF-是 private String gravidity; private String parity; @@ -76,6 +76,8 @@ public class HuadaSieveApplyOrderAddRequest { private String intervenTional; private String intervenTionalOtherDesc; + + public String getProductCode() { return productCode; }