From 1fd78cc5987ba0b434f1dac2eec71a7ae15072fc Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 22 Jul 2021 11:42:32 +0800 Subject: [PATCH] update --- .../com/lyms/hospitalapi/lhxfy/LhxfyService.java | 164 ++++++++++----------- .../operate/web/facade/MatDeliverFacade.java | 4 +- 2 files changed, 76 insertions(+), 92 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java index 0da8484..0d8ccea 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java @@ -83,6 +83,11 @@ public class LhxfyService { Map itemParam = new HashMap<>(1); itemParam.put("cardNo", cardNo); String json = HttpClientUtil.doGet(LHFY_LIS_URL, itemParam,"utf-8",""); +// 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}]"; +// if ("13082519880407271X".equals(cardNo)) +// { +// 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}]"; +// } if (StringUtils.isNotEmpty(json)) { return JsonUtil.jsonToList(json,LisReportModel.class); @@ -105,39 +110,20 @@ public class LhxfyService { System.out.println("autoInLis WifeCardNo="+preEugenicsBaseModel.getWifeCardNo()); //查询妻子的lis //白带检查 - List bdjc = new LinkedList<>(); - bdjc.add(-1); - bdjc.add(-1); - bdjc.add(-1); - bdjc.add(-1); - bdjc.add(-1); - bdjc.add(-1); - bdjc.add(-1); - bdjc.add(-1); + // List bdjc = new ArrayList<>(8); + Integer[] bdjc = new Integer[]{-1,-1,-1,-1,-1,-1,-1,-1}; //血细胞分析 - List xxbfx = new LinkedList<>(); - xxbfx.add(""); - xxbfx.add(""); - xxbfx.add(""); - xxbfx.add(""); - xxbfx.add(""); - xxbfx.add(""); - xxbfx.add(""); - xxbfx.add(""); - xxbfx.add(""); - //尿常规 - List ncg = new LinkedList<>(); - ncg.add(-1); - ncg.add(""); + //List xxbfx = new ArrayList<>(9); + String[] xxbfx = new String[9]; + +// //尿常规 +// Object[] ncg = new Object[-1,""]; +// ncg.add(-1); +// ncg.add(""); //乙肝血清学检查 - List yigan = new LinkedList<>(); - yigan.add(-1); - yigan.add(-1); - yigan.add(-1); - yigan.add(-1); - yigan.add(-1); + Integer[] yigan = new Integer[]{-1,-1,-1,-1,-1}; Map wifeClinicalCheck = preEugenicsBaseModel.getWifeClinicalCheck(); if (wifeClinicalCheck == null || wifeClinicalCheck.size() == 0) @@ -146,7 +132,7 @@ public class LhxfyService { } List lisReportModels = getLhxfyLis(preEugenicsBaseModel.getWifeCardNo()); - System.out.println("lisReportModels="+lisReportModels.size()); + System.out.println("lisReportModels=" + lisReportModels.size()); if (CollectionUtils.isNotEmpty(lisReportModels)) { for (LisReportModel model : lisReportModels) { @@ -157,6 +143,7 @@ public class LhxfyService { System.out.println("LisReportModel="+model.getLisId()); List itemModels = model.getItems(); if (CollectionUtils.isNotEmpty(itemModels)) { + System.out.println("itemModels="+itemModels.size()); for (LisReportItemModel itemModel : itemModels) { String code = itemModel.getCode(); String result = itemModel.getResult(); @@ -165,11 +152,11 @@ public class LhxfyService { { if (result.contains("阴性") || result.contains("-")) { - bdjc.add(0, 0); + bdjc[0]= 0; } else if (result.contains("阳性") || result.contains("+")) { - bdjc.add(0, 1); + bdjc[0]= 1; } } @@ -177,11 +164,11 @@ public class LhxfyService { { if (result.contains("阴性")) { - bdjc.add(1, 0); + bdjc[1]= 0; } else if (result.contains("阳性")) { - bdjc.add(1, 1); + bdjc[1]= 1; } } @@ -189,35 +176,35 @@ public class LhxfyService { { if (result.contains("阴性") || result.contains("-")) { - bdjc.add(2, 0); + bdjc[2]= 0; } else if (result.contains("阳性") || result.contains("+")) { - bdjc.add(2, 1); + bdjc[2]= 1; } } else if ("QJD".equals(code)) { if (result.equals("I") || result.equals("Ⅰ")) { - bdjc.add(3, 0); + bdjc[3]= 0; } else if (result.equals("II") || result.equals("Ⅱ")) { - bdjc.add(3, 1); + bdjc[3]= 1; } else if (result.equals("Ⅲ") || result.equals("III")) { - bdjc.add(3, 8); + bdjc[3]= 8; } else if (result.equals("IV") || result.equals("IV")) { - bdjc.add(3, 9); + bdjc[3]= 9; } } if ("ACWSY".equals(code)) { if (result.contains("阴性")) { - bdjc.add(4, 0); + bdjc[4]= 0; } else if (result.contains("阳性")) { - bdjc.add(4, 1); + bdjc[4]= 1; } } @@ -228,11 +215,11 @@ public class LhxfyService { if (d < 4.5 ) { - bdjc.add(5, 0); + bdjc[5]= 0; } else { - bdjc.add(5, 1); + bdjc[5]= 1; } }catch (Exception e) { @@ -244,60 +231,60 @@ public class LhxfyService { { if (result.contains("阴性")) { - bdjc.add(6, 0); + bdjc[6]= 0; } else if (result.contains("阳性")) { - bdjc.add(6, 1); + bdjc[6]= 1; } } if ("SYYYT".equals(code)) { if (result.contains("阴性")) { - bdjc.add(7, 0); + bdjc[7]= 0; } else if (result.contains("阳性")) { - bdjc.add(7, 1); + bdjc[7]= 1; } } if ("HGB".equals(code)) { - xxbfx.add(0,result); + xxbfx[0] = result; } if ("RBC".equals(code)) { - xxbfx.add(1,result); + xxbfx[1] = result; } if ("PLT".equals(code)) { - xxbfx.add(2,result); + xxbfx[2] = result; } if ("WBC".equals(code)) { - xxbfx.add(3,result); + xxbfx[3] = result; } - if (code.contains("NEUT%")) + if (code.contains("NEU%")) { - xxbfx.add(4,result); + xxbfx[4] = result; } - if (code.contains("EO%")) + if (code.contains("EOS%")) { - xxbfx.add(7,result); + xxbfx[7] = result; } - if (code.contains("BASO%")) + if (code.contains("BAS%")) { - xxbfx.add(8,result); + xxbfx[8] = result; } - if (code.contains("LYMPH%")) + if (code.contains("LYM%")) { - xxbfx.add(5,result); + xxbfx[5] = result; } - if (code.contains("MONO%")) + if (code.contains("MON%")) { - xxbfx.add(6,result); + xxbfx[6] = result; } //RH血型 if ("RH".equals(code)) @@ -341,10 +328,10 @@ public class LhxfyService { { if (result.contains("阴性")) { - yigan.add(0, 0); + yigan[0] = 0; } else if (result.contains("阳性")) { - yigan.add(0, 1); + yigan[0] = 1; } } @@ -352,10 +339,10 @@ public class LhxfyService { { if (result.contains("阴性")) { - yigan.add(1, 0); + yigan[1] = 0; } else if (result.contains("阳性")) { - yigan.add(1,1); + yigan[1] = 1; } } @@ -363,10 +350,10 @@ public class LhxfyService { { if (result.contains("阴性")) { - yigan.add(2, 0); + yigan[2] = 0; } else if (result.contains("阳性")) { - yigan.add(2,1); + yigan[2] = 1; } } @@ -374,10 +361,10 @@ public class LhxfyService { { if (result.contains("阴性")) { - yigan.add(3, 0); + yigan[3] = 0; } else if (result.contains("阳性")) { - yigan.add(3,1); + yigan[3] = 1; } } @@ -385,10 +372,10 @@ public class LhxfyService { { if (result.contains("阴性")) { - yigan.add(4, 0); + yigan[4] = 0; } else if (result.contains("阳性")) { - yigan.add(4,1); + yigan[4] = 1; } } @@ -480,13 +467,10 @@ public class LhxfyService { wifeClinicalCheck.put("xxbfx",xxbfx); wifeClinicalCheck.put("yigan",yigan); + preEugenicsBaseModel.setWifeClinicalCheck(wifeClinicalCheck); + //乙肝血清学检查 - List hyigan = new LinkedList<>(); - hyigan.add(-1); - hyigan.add(-1); - hyigan.add(-1); - hyigan.add(-1); - hyigan.add(-1); + Integer[] hyigan = new Integer[]{-1,-1,-1,-1,-1}; //尿常规 // List hncg = new LinkedList<>(); @@ -499,7 +483,7 @@ public class LhxfyService { husbandClinicalCheck = new HashMap<>(); } - + System.out.println("autoInLis husbandCardNo="+preEugenicsBaseModel.getHusbandCardNo()); List hlisReportModels = getLhxfyLis(preEugenicsBaseModel.getHusbandCardNo()); if (CollectionUtils.isNotEmpty(hlisReportModels)) { for (LisReportModel model : hlisReportModels) { @@ -549,10 +533,10 @@ public class LhxfyService { { if (result.contains("阴性")) { - hyigan.add(0, 0); + hyigan[0]= 0; } else if (result.contains("阳性")) { - hyigan.add(0, 1); + hyigan[0]= 1; } } @@ -560,10 +544,10 @@ public class LhxfyService { { if (result.contains("阴性")) { - hyigan.add(1, 0); + hyigan[1]= 0; } else if (result.contains("阳性")) { - hyigan.add(1, 1); + hyigan[1]= 1; } } @@ -571,10 +555,10 @@ public class LhxfyService { { if (result.contains("阴性")) { - hyigan.add(2, 0); + hyigan[2]= 0; } else if (result.contains("阳性")) { - hyigan.add(2, 1); + hyigan[2]= 1; } } @@ -582,10 +566,10 @@ public class LhxfyService { { if (result.contains("阴性")) { - hyigan.add(3, 0); + hyigan[3]= 0; } else if (result.contains("阳性")) { - hyigan.add(3, 1); + hyigan[3]= 1; } } @@ -593,10 +577,10 @@ public class LhxfyService { { if (result.contains("阴性")) { - hyigan.add(4, 0); + hyigan[4]= 0; } else if (result.contains("阳性")) { - hyigan.add(4, 1); + hyigan[4]= 1; } } @@ -632,7 +616,7 @@ public class LhxfyService { } husbandClinicalCheck.put("yigan",hyigan); - + preEugenicsBaseModel.setHusbandClinicalCheck(husbandClinicalCheck); Query query1 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); Update update = MongoConvertHelper .convertToNativeUpdate(ReflectionUtils.getUpdateField(preEugenicsBaseModel)); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 82bc838..f70923e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -2749,7 +2749,7 @@ public class MatDeliverFacade { switch (childbirthManagerRequest.getStatus()) { case 1: - days = 3; + days = 5; break; case 2: days = 7; @@ -2758,7 +2758,7 @@ public class MatDeliverFacade { days = 14; break; case 4: - days = 28; + days = 3; break; case 5: days = 42; -- 1.8.3.1