jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 4ff4548fe03e140b8602b9982ccdbf506138aad4

Authored by liquanyu
1 parent cfe9362636
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

产筛无创添加字段

Showing 3 changed files with 32 additions and 10 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java View file @ 4ff4548
... ... @@ -110,23 +110,23 @@
110 110 private String chanSize;
111 111  
112 112 /**
113   - * 天然受孕 1/是 2/否
  113 + * 天然受孕 1/是 0/否
114 114 */
115 115 private String imprenation;
116 116  
117 117  
118 118 /**
119   - * 促排卵 1/是 2/否
  119 + * 促排卵 1/是 0/否
120 120 */
121 121 private String ovulationInduction;
122 122  
123 123 /**
124   - * iui 1/是 2/否
  124 + * iui 1/是 0/否
125 125 */
126 126 private String iui;
127 127  
128 128 /**
129   - * ivf 1/是 2/否
  129 + * ivf 1/是 0/否
130 130 */
131 131 private String ivf;
132 132  
... ... @@ -136,7 +136,7 @@
136 136 private String clinicalDiagnosis;
137 137  
138 138 /**
139   - * 胎数 1/单胎 2/双胎 3/多胎 4/异常
  139 + * 胎数 0/单胎 1/双胎 2/多胎 3/异常
140 140 */
141 141 private String fetusNum;
142 142  
... ... @@ -161,7 +161,7 @@
161 161 private String ultrasonicNtVal;
162 162  
163 163 /**
164   - * 血清筛查风险 1/高风险 2/低风险 3/临界风险
  164 + * 血清筛查风险 0/高风险 1/低风险 2/临界风险
165 165 */
166 166 private String serumScreeningRisk;
167 167  
... ... @@ -176,7 +176,7 @@
176 176 private String syndrome18;
177 177  
178 178 /**
179   - * 孕妇染色体核型 1/未做 2/正常 3/异常
  179 + * 孕妇染色体核型 0/未做 1/正常 2/异常
180 180 */
181 181 private String yfrsthx;
182 182  
... ... @@ -186,7 +186,7 @@
186 186 private String yfrsthxAbnormalInfo;
187 187  
188 188 /**
189   - * 丈夫染色体核型 1/未做 2/正常 3/异常
  189 + * 丈夫染色体核型 0/未做 1/正常 2/异常
190 190 */
191 191 private String zfrsthx;
192 192  
... ... @@ -196,7 +196,7 @@
196 196 private String zfrsthxAbnormalInfo;
197 197  
198 198 /**
199   - * 不良孕产史 1/无 2/有
  199 + * 不良孕产史 1/是 0/否
200 200 */
201 201 private String badMaternalHistory;
202 202  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java View file @ 4ff4548
... ... @@ -677,6 +677,26 @@
677 677 request.setBodyWeight(sieveApplyOrderModel.getWeight());
678 678 request.setSurgicalTransplantation(sieveApplyOrderModel.getYzss());
679 679  
  680 + request.setGravidaKaryotype(sieveApplyOrderModel.getYfrsthx());
  681 + request.setHusbandKaryotype(sieveApplyOrderModel.getZfrsthx());
  682 +
  683 + //本次妊娠情况
  684 + String pregnancy = null;
  685 + if (StringUtils.isNotEmpty(sieveApplyOrderModel.getImprenation()) && "1".equals(sieveApplyOrderModel.getImprenation()))
  686 + {
  687 + pregnancy = "0";
  688 + }
  689 + else if (StringUtils.isNotEmpty(sieveApplyOrderModel.getOvulationInduction()) && "1".equals(sieveApplyOrderModel.getOvulationInduction()))
  690 + {
  691 + pregnancy = "1";
  692 + }
  693 + else if (StringUtils.isNotEmpty(sieveApplyOrderModel.getIui()) && "1".equals(sieveApplyOrderModel.getIui()))
  694 + {
  695 + pregnancy = "2";
  696 + }
  697 + request.setPregnancy(pregnancy);
  698 +
  699 +
680 700 huadaSaveSampleInfo(request);
681 701 }
682 702 // }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/HuadaSieveApplyOrderAddRequest.java View file @ 4ff4548
... ... @@ -44,7 +44,7 @@
44 44 private String doctorName;
45 45 private String hosptialNum;
46 46 private String sampleRecipientEmail;
47   - private String pregnancy;
  47 + private String pregnancy; //0：本次妊娠方式-自然受孕 1：本次妊娠方式-促排卵 2：本次妊娠方式-宫内人工受精
48 48 private String adosculation;//是否是否体外受精-胚胎移植（IVF） 0：是否IVF-否 1：是否IVF-是
49 49 private String gravidity;
50 50 private String parity;
... ... @@ -75,6 +75,8 @@
75 75 private String bscanRemark;
76 76 private String intervenTional;
77 77 private String intervenTionalOtherDesc;
  78 +
  79 +
78 80  
79 81 public String getProductCode() {
80 82 return productCode;