liquanyu / regional-platform

Download as
Browse Code »

Commit 1fd78cc5987ba0b434f1dac2eec71a7ae15072fc

Authored by liquanyu
1 parent 6e45c5db57
Exists in master and in 1 other branch dev

update

Showing 2 changed files with 76 additions and 92 deletions

platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java View file @ 1fd78cc
... ... @@ -83,6 +83,11 @@
83 83 Map<String, String> itemParam = new HashMap<>(1);
84 84 itemParam.put("cardNo", cardNo);
85 85 String json = HttpClientUtil.doGet(LHFY_LIS_URL, itemParam,"utf-8","");
  86 +// String json = "[{\"id\":null,\"lisId\":\"508632\",\"title\":null,\"type\":null,\"vcCardNo\":\"130825199201183722\",\"name\":\"任艳姣\",\"bhnum\":\"2107200105\",\"age\":\"29岁\",\"sex\":\"2\",\"applyTime\":\"2021-07-20T04:11:22.000+00:00\",\"checkTime\":\"2021-07-20T04:10:35.000+00:00\",\"publishTime\":\"2021-07-20T07:41:02.000+00:00\",\"applyDoctor\":\"修素英\",\"applyDept\":\"保健科\",\"checker\":\"张丽娜\",\"modified\":\"2021-07-20T07:41:02.000+00:00\",\"created\":\"2021-07-20T04:11:22.000+00:00\",\"hospitalId\":null,\"phone\":null,\"items\":[{\"id\":null,\"lisId\":\"508632\",\"code\":\"WBC\",\"name\":\"白细胞数目\",\"result\":\"6.84\",\"resultFlag\":null,\"ref\":\"4--10\",\"resultType\":null,\"unit\":\"10^9/L\",\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null},{\"id\":null,\"lisId\":\"508632\",\"code\":\"HGB\",\"name\":\"血红蛋白浓度\",\"result\":\"142.00\",\"resultFlag\":null,\"ref\":\"110--150\",\"resultType\":null,\"unit\":\"g/L\",\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null},{\"id\":null,\"lisId\":\"508632\",\"code\":\"RBC\",\"name\":\"红细胞数目\",\"result\":\"4.76\",\"resultFlag\":null,\"ref\":\"3.5--5\",\"resultType\":null,\"unit\":\"10^12/L\",\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null},{\"id\":null,\"lisId\":\"508632\",\"code\":\"HCT\",\"name\":\"红细胞压积\",\"result\":\"42.10\",\"resultFlag\":null,\"ref\":\"37--47\",\"resultType\":null,\"unit\":\"%\",\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null},{\"id\":null,\"lisId\":\"508632\",\"code\":\"MCV\",\"name\":\"平均红细胞体积\",\"result\":\"88.30\",\"resultFlag\":null,\"ref\":\"80--100\",\"resultType\":null,\"unit\":\"fL\",\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null},{\"id\":null,\"lisId\":\"508632\",\"code\":\"MCH\",\"name\":\"平均红细胞血红蛋白含量\",\"result\":\"29.90\",\"resultFlag\":null,\"ref\":\"27--34\",\"resultType\":null,\"unit\":\"pg\",\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null},{\"id\":null,\"lisId\":\"508632\",\"code\":\"MCHC\",\"name\":\"平均红细胞血红蛋白浓度\",\"result\":\"339.00\",\"resultFlag\":null,\"ref\":\"320--360\",\"resultType\":null,\"unit\":\"g/L\",\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null},{\"id\":null,\"lisId\":\"508632\",\"code\":\"PLT\",\"name\":\"血小板数目\",\"result\":\"303.00\",\"resultFlag\":\"↑\",\"ref\":\"100--300\",\"resultType\":null,\"unit\":\"10^9/L\",\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null},{\"id\":null,\"lisId\":\"508632\",\"code\":\"RDW-SD\",\"name\":\"红细胞分布宽度标准差\",\"result\":\"38.90\",\"resultFlag\":null,\"ref\":\"35--56\",\"resultType\":null,\"unit\":\"fL\",\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null},{\"id\":null,\"lisId\":\"508632\",\"code\":\"RDW-CV\",\"name\":\"红细胞分布宽度变异系数\",\"result\":\"12.40\",\"resultFlag\":null,\"ref\":\"11--16\",\"resultType\":null,\"unit\":\"%\",\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null},{\"id\":null,\"lisId\":\"508632\",\"code\":\"PDW\",\"name\":\"血小板分布宽度\",\"result\":\"15.50\",\"resultFlag\":null,\"ref\":\"15--17\",\"resultType\":null,\"unit\":null,\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null},{\"id\":null,\"lisId\":\"508632\",\"code\":\"MPV\",\"name\":\"平均血小板体积\",\"result\":\"7.70\",\"resultFlag\":null,\"ref\":\"6.5--12\",\"resultType\":null,\"unit\":\"fL\",\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null},{\"id\":null,\"lisId\":\"508632\",\"code\":\"P-LCC\",\"name\":\"大血小板数目\",\"result\":\"34.00\",\"resultFlag\":null,\"ref\":\"30--90\",\"resultType\":null,\"unit\":\"10^9/L\",\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null},{\"id\":null,\"lisId\":\"508632\",\"code\":\"P-LCR\",\"name\":\"大血小板比率\",\"result\":\"11.10\",\"resultFlag\":null,\"ref\":\"11--45\",\"resultType\":null,\"unit\":\"%\",\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null},{\"id\":null,\"lisId\":\"508632\",\"code\":\"PCT\",\"name\":\"血小板压积\",\"result\":\"0.233\",\"resultFlag\":null,\"ref\":\"0.108--0.282\",\"resultType\":null,\"unit\":\"%\",\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null},{\"id\":null,\"lisId\":\"508632\",\"code\":\"NEU#\",\"name\":\"中性粒细胞数目\",\"result\":\"4.09\",\"resultFlag\":null,\"ref\":\"2--7\",\"resultType\":null,\"unit\":\"10^9/L\",\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null},{\"id\":null,\"lisId\":\"508632\",\"code\":\"LYM#\",\"name\":\"淋巴细胞数目\",\"result\":\"2.33\",\"resultFlag\":null,\"ref\":\"0.8--4\",\"resultType\":null,\"unit\":\"10^9/L\",\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null},{\"id\":null,\"lisId\":\"508632\",\"code\":\"MON#\",\"name\":\"单核细胞数目\",\"result\":\"0.25\",\"resultFlag\":null,\"ref\":\"0.12--1.2\",\"resultType\":null,\"unit\":\"10^9/L\",\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null},{\"id\":null,\"lisId\":\"508632\",\"code\":\"EOS#\",\"name\":\"嗜酸性粒细胞数目\",\"result\":\"0.14\",\"resultFlag\":null,\"ref\":\"0.02--0.5\",\"resultType\":null,\"unit\":\"10^9/L\",\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null},{\"id\":null,\"lisId\":\"508632\",\"code\":\"BAS#\",\"name\":\"嗜碱性粒细胞数目\",\"result\":\"0.03\",\"resultFlag\":null,\"ref\":\"0--0.1\",\"resultType\":null,\"unit\":\"10^9/L\",\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null},{\"id\":null,\"lisId\":\"508632\",\"code\":\"NEU%\",\"name\":\"中性粒细胞百分比\",\"result\":\"59.90\",\"resultFlag\":null,\"ref\":\"50--70\",\"resultType\":null,\"unit\":\"%\",\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null},{\"id\":null,\"lisId\":\"508632\",\"code\":\"LYM%\",\"name\":\"淋巴细胞百分比\",\"result\":\"34.10\",\"resultFlag\":null,\"ref\":\"20--40\",\"resultType\":null,\"unit\":\"%\",\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null},{\"id\":null,\"lisId\":\"508632\",\"code\":\"MON%\",\"name\":\"单核细胞百分比\",\"result\":\"3.60\",\"resultFlag\":null,\"ref\":\"3--12\",\"resultType\":null,\"unit\":\"%\",\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null},{\"id\":null,\"lisId\":\"508632\",\"code\":\"EOS%\",\"name\":\"嗜酸性粒细胞百分比\",\"result\":\"2.00\",\"resultFlag\":null,\"ref\":\"0.5--5\",\"resultType\":null,\"unit\":\"%\",\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null},{\"id\":null,\"lisId\":\"508632\",\"code\":\"BAS%\",\"name\":\"嗜碱性粒细胞百分比\",\"result\":\"0.40\",\"resultFlag\":null,\"ref\":\"0--1\",\"resultType\":null,\"unit\":\"%\",\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null}],\"status\":null}]";
  87 +// if ("13082519880407271X".equals(cardNo))
  88 +// {
  89 +// json = "[{\"id\":null,\"lisId\":\"508635\",\"title\":null,\"type\":null,\"vcCardNo\":\"13082519880407271X\",\"name\":\"郭学刚\",\"bhnum\":\"2004130003\",\"age\":\"32岁\",\"sex\":\"1\",\"applyTime\":\"2021-07-20T04:12:39.000+00:00\",\"checkTime\":\"2021-07-20T04:12:00.000+00:00\",\"publishTime\":\"2021-07-20T07:41:24.000+00:00\",\"applyDoctor\":\"卜国林\",\"applyDept\":\"保健科\",\"checker\":\"张丽娜\",\"modified\":\"2021-07-20T07:41:24.000+00:00\",\"created\":\"2021-07-20T04:12:39.000+00:00\",\"hospitalId\":null,\"phone\":null,\"items\":[{\"id\":null,\"lisId\":\"508635\",\"code\":\"WBC\",\"name\":\"白细胞数目\",\"result\":\"3.10\",\"resultFlag\":\"↓\",\"ref\":\"4--10\",\"resultType\":null,\"unit\":\"10^9/L\",\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null},{\"id\":null,\"lisId\":\"508635\",\"code\":\"HGB\",\"name\":\"血红蛋白浓度\",\"result\":\"154.00\",\"resultFlag\":null,\"ref\":\"120--160\",\"resultType\":null,\"unit\":\"g/L\",\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null},{\"id\":null,\"lisId\":\"508635\",\"code\":\"RBC\",\"name\":\"红细胞数目\",\"result\":\"4.83\",\"resultFlag\":null,\"ref\":\"4--5.5\",\"resultType\":null,\"unit\":\"10^12/L\",\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null},{\"id\":null,\"lisId\":\"508635\",\"code\":\"HCT\",\"name\":\"红细胞压积\",\"result\":\"44.70\",\"resultFlag\":null,\"ref\":\"40--54\",\"resultType\":null,\"unit\":\"%\",\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null},{\"id\":null,\"lisId\":\"508635\",\"code\":\"MCV\",\"name\":\"平均红细胞体积\",\"result\":\"92.50\",\"resultFlag\":null,\"ref\":\"80--100\",\"resultType\":null,\"unit\":\"fL\",\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null},{\"id\":null,\"lisId\":\"508635\",\"code\":\"MCH\",\"name\":\"平均红细胞血红蛋白含量\",\"result\":\"31.80\",\"resultFlag\":null,\"ref\":\"27--34\",\"resultType\":null,\"unit\":\"pg\",\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null},{\"id\":null,\"lisId\":\"508635\",\"code\":\"MCHC\",\"name\":\"平均红细胞血红蛋白浓度\",\"result\":\"344.00\",\"resultFlag\":null,\"ref\":\"320--360\",\"resultType\":null,\"unit\":\"g/L\",\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null},{\"id\":null,\"lisId\":\"508635\",\"code\":\"PLT\",\"name\":\"血小板数目\",\"result\":\"158.00\",\"resultFlag\":null,\"ref\":\"100--300\",\"resultType\":null,\"unit\":\"10^9/L\",\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null},{\"id\":null,\"lisId\":\"508635\",\"code\":\"RDW-SD\",\"name\":\"红细胞分布宽度标准差\",\"result\":\"40.60\",\"resultFlag\":null,\"ref\":null,\"resultType\":null,\"unit\":\"fL\",\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null},{\"id\":null,\"lisId\":\"508635\",\"code\":\"RDW-CV\",\"name\":\"红细胞分布宽度变异系数\",\"result\":\"12.40\",\"resultFlag\":null,\"ref\":\"11--16\",\"resultType\":null,\"unit\":\"%\",\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null},{\"id\":null,\"lisId\":\"508635\",\"code\":\"PDW\",\"name\":\"血小板分布宽度\",\"result\":\"16.20\",\"resultFlag\":null,\"ref\":\"15--17\",\"resultType\":null,\"unit\":null,\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null},{\"id\":null,\"lisId\":\"508635\",\"code\":\"MPV\",\"name\":\"平均血小板体积\",\"result\":\"9.50\",\"resultFlag\":null,\"ref\":\"6.5--12\",\"resultType\":null,\"unit\":\"fL\",\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null},{\"id\":null,\"lisId\":\"508635\",\"code\":\"P-LCC\",\"name\":\"大血小板数目\",\"result\":\"36.00\",\"resultFlag\":null,\"ref\":\"30--90\",\"resultType\":null,\"unit\":\"10^9/L\",\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null},{\"id\":null,\"lisId\":\"508635\",\"code\":\"P-LCR\",\"name\":\"大血小板比率\",\"result\":\"22.60\",\"resultFlag\":null,\"ref\":\"11--45\",\"resultType\":null,\"unit\":\"%\",\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null},{\"id\":null,\"lisId\":\"508635\",\"code\":\"PCT\",\"name\":\"血小板压积\",\"result\":\"0.150\",\"resultFlag\":null,\"ref\":\"0.108--0.282\",\"resultType\":null,\"unit\":\"%\",\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null},{\"id\":null,\"lisId\":\"508635\",\"code\":\"NEU#\",\"name\":\"中性粒细胞数目\",\"result\":\"1.63\",\"resultFlag\":\"↓\",\"ref\":\"2--7\",\"resultType\":null,\"unit\":\"10^9/L\",\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null},{\"id\":null,\"lisId\":\"508635\",\"code\":\"LYM#\",\"name\":\"淋巴细胞数目\",\"result\":\"1.08\",\"resultFlag\":null,\"ref\":\"0.8--4\",\"resultType\":null,\"unit\":\"10^9/L\",\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null},{\"id\":null,\"lisId\":\"508635\",\"code\":\"MON#\",\"name\":\"单核细胞数目\",\"result\":\"0.24\",\"resultFlag\":null,\"ref\":\"0.12--1.2\",\"resultType\":null,\"unit\":\"10^9/L\",\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null},{\"id\":null,\"lisId\":\"508635\",\"code\":\"EOS#\",\"name\":\"嗜酸性粒细胞数目\",\"result\":\"0.14\",\"resultFlag\":null,\"ref\":\"0.02--0.5\",\"resultType\":null,\"unit\":\"10^9/L\",\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null},{\"id\":null,\"lisId\":\"508635\",\"code\":\"BAS#\",\"name\":\"嗜碱性粒细胞数目\",\"result\":\"0.01\",\"resultFlag\":null,\"ref\":\"0--0.1\",\"resultType\":null,\"unit\":\"10^9/L\",\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null},{\"id\":null,\"lisId\":\"508635\",\"code\":\"NEU%\",\"name\":\"中性粒细胞百分比\",\"result\":\"53.00\",\"resultFlag\":null,\"ref\":\"50--70\",\"resultType\":null,\"unit\":\"%\",\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null},{\"id\":null,\"lisId\":\"508635\",\"code\":\"LYM%\",\"name\":\"淋巴细胞百分比\",\"result\":\"34.70\",\"resultFlag\":null,\"ref\":\"20--40\",\"resultType\":null,\"unit\":\"%\",\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null},{\"id\":null,\"lisId\":\"508635\",\"code\":\"MON%\",\"name\":\"单核细胞百分比\",\"result\":\"7.60\",\"resultFlag\":null,\"ref\":\"3--12\",\"resultType\":null,\"unit\":\"%\",\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null},{\"id\":null,\"lisId\":\"508635\",\"code\":\"EOS%\",\"name\":\"嗜酸性粒细胞百分比\",\"result\":\"4.40\",\"resultFlag\":null,\"ref\":\"0.5--5\",\"resultType\":null,\"unit\":\"%\",\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null},{\"id\":null,\"lisId\":\"508635\",\"code\":\"BAS%\",\"name\":\"嗜碱性粒细胞百分比\",\"result\":\"0.30\",\"resultFlag\":null,\"ref\":\"0--1\",\"resultType\":null,\"unit\":\"%\",\"printOrder\":null,\"charResult\":null,\"numberResult\":null,\"hospitalId\":null}],\"status\":null}]";
  90 +// }
86 91 if (StringUtils.isNotEmpty(json))
87 92 {
88 93 return JsonUtil.jsonToList(json,LisReportModel.class);
89 94  
90 95  
91 96  
... ... @@ -105,39 +110,20 @@
105 110 System.out.println("autoInLis WifeCardNo="+preEugenicsBaseModel.getWifeCardNo());
106 111 //查询妻子的lis
107 112 //白带检查
108   - List<Integer> bdjc = new LinkedList<>();
109   - bdjc.add(-1);
110   - bdjc.add(-1);
111   - bdjc.add(-1);
112   - bdjc.add(-1);
113   - bdjc.add(-1);
114   - bdjc.add(-1);
115   - bdjc.add(-1);
116   - bdjc.add(-1);
  113 + // List<Integer> bdjc = new ArrayList<>(8);
  114 + Integer[] bdjc = new Integer[]{-1,-1,-1,-1,-1,-1,-1,-1};
117 115  
118 116 //血细胞分析
119   - List<String> xxbfx = new LinkedList<>();
120   - xxbfx.add("");
121   - xxbfx.add("");
122   - xxbfx.add("");
123   - xxbfx.add("");
124   - xxbfx.add("");
125   - xxbfx.add("");
126   - xxbfx.add("");
127   - xxbfx.add("");
128   - xxbfx.add("");
129   - //尿常规
130   - List<Object> ncg = new LinkedList<>();
131   - ncg.add(-1);
132   - ncg.add("");
  117 + //List<String> xxbfx = new ArrayList<>(9);
  118 + String[] xxbfx = new String[9];
133 119  
  120 +// //尿常规
  121 +// Object[] ncg = new Object[-1,""];
  122 +// ncg.add(-1);
  123 +// ncg.add("");
  124 +
134 125 //乙肝血清学检查
135   - List<Integer> yigan = new LinkedList<>();
136   - yigan.add(-1);
137   - yigan.add(-1);
138   - yigan.add(-1);
139   - yigan.add(-1);
140   - yigan.add(-1);
  126 + Integer[] yigan = new Integer[]{-1,-1,-1,-1,-1};
141 127  
142 128 Map<String, Object> wifeClinicalCheck = preEugenicsBaseModel.getWifeClinicalCheck();
143 129 if (wifeClinicalCheck == null || wifeClinicalCheck.size() == 0)
... ... @@ -146,7 +132,7 @@
146 132 }
147 133  
148 134 List<LisReportModel> lisReportModels = getLhxfyLis(preEugenicsBaseModel.getWifeCardNo());
149   - System.out.println("lisReportModels="+lisReportModels.size());
  135 + System.out.println("lisReportModels=" + lisReportModels.size());
150 136 if (CollectionUtils.isNotEmpty(lisReportModels)) {
151 137 for (LisReportModel model : lisReportModels) {
152 138  
... ... @@ -157,6 +143,7 @@
157 143 System.out.println("LisReportModel="+model.getLisId());
158 144 List<LisReportItemModel> itemModels = model.getItems();
159 145 if (CollectionUtils.isNotEmpty(itemModels)) {
  146 + System.out.println("itemModels="+itemModels.size());
160 147 for (LisReportItemModel itemModel : itemModels) {
161 148 String code = itemModel.getCode();
162 149 String result = itemModel.getResult();
163 150  
... ... @@ -165,11 +152,11 @@
165 152 {
166 153 if (result.contains("阴性") || result.contains("-"))
167 154 {
168   - bdjc.add(0, 0);
  155 + bdjc[0]= 0;
169 156 }
170 157 else if (result.contains("阳性") || result.contains("+"))
171 158 {
172   - bdjc.add(0, 1);
  159 + bdjc[0]= 1;
173 160 }
174 161 }
175 162  
176 163  
... ... @@ -177,11 +164,11 @@
177 164 {
178 165 if (result.contains("阴性"))
179 166 {
180   - bdjc.add(1, 0);
  167 + bdjc[1]= 0;
181 168 }
182 169 else if (result.contains("阳性"))
183 170 {
184   - bdjc.add(1, 1);
  171 + bdjc[1]= 1;
185 172 }
186 173 }
187 174  
188 175  
189 176  
190 177  
191 178  
192 179  
193 180  
194 181  
... ... @@ -189,35 +176,35 @@
189 176 {
190 177 if (result.contains("阴性") || result.contains("-"))
191 178 {
192   - bdjc.add(2, 0);
  179 + bdjc[2]= 0;
193 180 }
194 181 else if (result.contains("阳性") || result.contains("+"))
195 182 {
196   - bdjc.add(2, 1);
  183 + bdjc[2]= 1;
197 184 }
198 185 }
199 186  
200 187 else if ("QJD".equals(code))
201 188 {
202 189 if (result.equals("I") || result.equals("Ⅰ")) {
203   - bdjc.add(3, 0);
  190 + bdjc[3]= 0;
204 191 } else if (result.equals("II") || result.equals("Ⅱ")) {
205   - bdjc.add(3, 1);
  192 + bdjc[3]= 1;
206 193 } else if (result.equals("Ⅲ") || result.equals("III")) {
207   - bdjc.add(3, 8);
  194 + bdjc[3]= 8;
208 195 } else if (result.equals("IV") || result.equals("IV")) {
209   - bdjc.add(3, 9);
  196 + bdjc[3]= 9;
210 197 }
211 198 }
212 199 if ("ACWSY".equals(code))
213 200 {
214 201 if (result.contains("阴性"))
215 202 {
216   - bdjc.add(4, 0);
  203 + bdjc[4]= 0;
217 204 }
218 205 else if (result.contains("阳性"))
219 206 {
220   - bdjc.add(4, 1);
  207 + bdjc[4]= 1;
221 208 }
222 209 }
223 210  
224 211  
... ... @@ -228,11 +215,11 @@
228 215  
229 216 if (d < 4.5 )
230 217 {
231   - bdjc.add(5, 0);
  218 + bdjc[5]= 0;
232 219 }
233 220 else
234 221 {
235   - bdjc.add(5, 1);
  222 + bdjc[5]= 1;
236 223 }
237 224 }catch (Exception e)
238 225 {
239 226  
240 227  
241 228  
242 229  
243 230  
244 231  
245 232  
246 233  
247 234  
248 235  
249 236  
250 237  
251 238  
252 239  
253 240  
254 241  
255 242  
... ... @@ -244,60 +231,60 @@
244 231 {
245 232 if (result.contains("阴性"))
246 233 {
247   - bdjc.add(6, 0);
  234 + bdjc[6]= 0;
248 235 }
249 236 else if (result.contains("阳性"))
250 237 {
251   - bdjc.add(6, 1);
  238 + bdjc[6]= 1;
252 239 }
253 240 }
254 241 if ("SYYYT".equals(code))
255 242 {
256 243 if (result.contains("阴性"))
257 244 {
258   - bdjc.add(7, 0);
  245 + bdjc[7]= 0;
259 246 }
260 247 else if (result.contains("阳性"))
261 248 {
262   - bdjc.add(7, 1);
  249 + bdjc[7]= 1;
263 250 }
264 251 }
265 252  
266 253 if ("HGB".equals(code))
267 254 {
268   - xxbfx.add(0,result);
  255 + xxbfx[0] = result;
269 256 }
270 257 if ("RBC".equals(code))
271 258 {
272   - xxbfx.add(1,result);
  259 + xxbfx[1] = result;
273 260 }
274 261 if ("PLT".equals(code))
275 262 {
276   - xxbfx.add(2,result);
  263 + xxbfx[2] = result;
277 264 }
278 265 if ("WBC".equals(code))
279 266 {
280   - xxbfx.add(3,result);
  267 + xxbfx[3] = result;
281 268 }
282   - if (code.contains("NEUT%"))
  269 + if (code.contains("NEU%"))
283 270 {
284   - xxbfx.add(4,result);
  271 + xxbfx[4] = result;
285 272 }
286   - if (code.contains("EO%"))
  273 + if (code.contains("EOS%"))
287 274 {
288   - xxbfx.add(7,result);
  275 + xxbfx[7] = result;
289 276 }
290   - if (code.contains("BASO%"))
  277 + if (code.contains("BAS%"))
291 278 {
292   - xxbfx.add(8,result);
  279 + xxbfx[8] = result;
293 280 }
294   - if (code.contains("LYMPH%"))
  281 + if (code.contains("LYM%"))
295 282 {
296   - xxbfx.add(5,result);
  283 + xxbfx[5] = result;
297 284 }
298   - if (code.contains("MONO%"))
  285 + if (code.contains("MON%"))
299 286 {
300   - xxbfx.add(6,result);
  287 + xxbfx[6] = result;
301 288 }
302 289 //RH血型
303 290 if ("RH".equals(code))
304 291  
... ... @@ -341,10 +328,10 @@
341 328 {
342 329 if (result.contains("阴性"))
343 330 {
344   - yigan.add(0, 0);
  331 + yigan[0] = 0;
345 332 } else if (result.contains("阳性"))
346 333 {
347   - yigan.add(0, 1);
  334 + yigan[0] = 1;
348 335 }
349 336 }
350 337  
351 338  
... ... @@ -352,10 +339,10 @@
352 339 {
353 340 if (result.contains("阴性"))
354 341 {
355   - yigan.add(1, 0);
  342 + yigan[1] = 0;
356 343 } else if (result.contains("阳性"))
357 344 {
358   - yigan.add(1,1);
  345 + yigan[1] = 1;
359 346 }
360 347 }
361 348  
362 349  
... ... @@ -363,10 +350,10 @@
363 350 {
364 351 if (result.contains("阴性"))
365 352 {
366   - yigan.add(2, 0);
  353 + yigan[2] = 0;
367 354 } else if (result.contains("阳性"))
368 355 {
369   - yigan.add(2,1);
  356 + yigan[2] = 1;
370 357 }
371 358 }
372 359  
373 360  
... ... @@ -374,10 +361,10 @@
374 361 {
375 362 if (result.contains("阴性"))
376 363 {
377   - yigan.add(3, 0);
  364 + yigan[3] = 0;
378 365 } else if (result.contains("阳性"))
379 366 {
380   - yigan.add(3,1);
  367 + yigan[3] = 1;
381 368 }
382 369 }
383 370  
384 371  
... ... @@ -385,10 +372,10 @@
385 372 {
386 373 if (result.contains("阴性"))
387 374 {
388   - yigan.add(4, 0);
  375 + yigan[4] = 0;
389 376 } else if (result.contains("阳性"))
390 377 {
391   - yigan.add(4,1);
  378 + yigan[4] = 1;
392 379 }
393 380 }
394 381  
395 382  
... ... @@ -480,13 +467,10 @@
480 467 wifeClinicalCheck.put("xxbfx",xxbfx);
481 468 wifeClinicalCheck.put("yigan",yigan);
482 469  
  470 + preEugenicsBaseModel.setWifeClinicalCheck(wifeClinicalCheck);
  471 +
483 472 //乙肝血清学检查
484   - List<Integer> hyigan = new LinkedList<>();
485   - hyigan.add(-1);
486   - hyigan.add(-1);
487   - hyigan.add(-1);
488   - hyigan.add(-1);
489   - hyigan.add(-1);
  473 + Integer[] hyigan = new Integer[]{-1,-1,-1,-1,-1};
490 474  
491 475 //尿常规
492 476 // List<Object> hncg = new LinkedList<>();
... ... @@ -499,7 +483,7 @@
499 483 husbandClinicalCheck = new HashMap<>();
500 484 }
501 485  
502   -
  486 + System.out.println("autoInLis husbandCardNo="+preEugenicsBaseModel.getHusbandCardNo());
503 487 List<LisReportModel> hlisReportModels = getLhxfyLis(preEugenicsBaseModel.getHusbandCardNo());
504 488 if (CollectionUtils.isNotEmpty(hlisReportModels)) {
505 489 for (LisReportModel model : hlisReportModels) {
506 490  
... ... @@ -549,10 +533,10 @@
549 533 {
550 534 if (result.contains("阴性"))
551 535 {
552   - hyigan.add(0, 0);
  536 + hyigan[0]= 0;
553 537 } else if (result.contains("阳性"))
554 538 {
555   - hyigan.add(0, 1);
  539 + hyigan[0]= 1;
556 540 }
557 541 }
558 542  
559 543  
... ... @@ -560,10 +544,10 @@
560 544 {
561 545 if (result.contains("阴性"))
562 546 {
563   - hyigan.add(1, 0);
  547 + hyigan[1]= 0;
564 548 } else if (result.contains("阳性"))
565 549 {
566   - hyigan.add(1, 1);
  550 + hyigan[1]= 1;
567 551 }
568 552 }
569 553  
570 554  
... ... @@ -571,10 +555,10 @@
571 555 {
572 556 if (result.contains("阴性"))
573 557 {
574   - hyigan.add(2, 0);
  558 + hyigan[2]= 0;
575 559 } else if (result.contains("阳性"))
576 560 {
577   - hyigan.add(2, 1);
  561 + hyigan[2]= 1;
578 562 }
579 563 }
580 564  
581 565  
... ... @@ -582,10 +566,10 @@
582 566 {
583 567 if (result.contains("阴性"))
584 568 {
585   - hyigan.add(3, 0);
  569 + hyigan[3]= 0;
586 570 } else if (result.contains("阳性"))
587 571 {
588   - hyigan.add(3, 1);
  572 + hyigan[3]= 1;
589 573 }
590 574 }
591 575  
592 576  
... ... @@ -593,10 +577,10 @@
593 577 {
594 578 if (result.contains("阴性"))
595 579 {
596   - hyigan.add(4, 0);
  580 + hyigan[4]= 0;
597 581 } else if (result.contains("阳性"))
598 582 {
599   - hyigan.add(4, 1);
  583 + hyigan[4]= 1;
600 584 }
601 585 }
602 586  
... ... @@ -632,7 +616,7 @@
632 616 }
633 617  
634 618 husbandClinicalCheck.put("yigan",hyigan);
635   -
  619 + preEugenicsBaseModel.setHusbandClinicalCheck(husbandClinicalCheck);
636 620 Query query1 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
637 621 Update update = MongoConvertHelper
638 622 .convertToNativeUpdate(ReflectionUtils.getUpdateField(preEugenicsBaseModel));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 1fd78cc
... ... @@ -2749,7 +2749,7 @@
2749 2749 switch (childbirthManagerRequest.getStatus())
2750 2750 {
2751 2751 case 1:
2752   - days = 3;
  2752 + days = 5;
2753 2753 break;
2754 2754 case 2:
2755 2755 days = 7;
... ... @@ -2758,7 +2758,7 @@
2758 2758 days = 14;
2759 2759 break;
2760 2760 case 4:
2761   - days = 28;
  2761 + days = 3;
2762 2762 break;
2763 2763 case 5:
2764 2764 days = 42;