jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 1bda09e70e0690fd44e2cfa7025fe6f24c56f622

Authored by jiangjiazhi
2 parents 7f85de1ea8 08fa8f3001
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 6 changed files

platform-common/src/main/java/com/lyms/platform/common/enums/CZFmTypeEnums.java View file @ 1bda09e
... ... @@ -10,7 +10,11 @@
10 10 O1("剖宫产", 2),
11 11 O2("引产", 3),
12 12 O3("人工流产", 4),
13   - O4("药物流产", 5);
  13 + O4("药物流产", 5),
  14 + O5("难免流产", 6),
  15 + O6("剖宫流产", 7),
  16 + O7("自然流产", 9),
  17 + O8("生化妊娠", 10);
14 18 private CZFmTypeEnums(String name, int id) {
15 19 this.id = id;
16 20 this.name = name;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 1bda09e
... ... @@ -1977,6 +1977,10 @@
1977 1977 if (CollectionUtils.isNotEmpty(antExChuModels)) {
1978 1978 lastTime = DateUtil.getyyyy_MM_dd(antExChuModels.get(0).getCheckTime());
1979 1979 antexListResult.setTireNumber1(antExChuModels.get(0).getTireNumber());
  1980 +
  1981 + antexListResult.setTreatmentOpinion2Types(mongoUtil.findPlatValues(antExChuModels.get(0).getTreatmentOpinion2Types()));
  1982 + antexListResult.setTreatmentOpinion2(mongoUtil.findPlatList(antExChuModels.get(0).getTreatmentOpinion2()));
  1983 +
1980 1984 } else {
1981 1985 PatientsQuery patientsQuery1 = new PatientsQuery();
1982 1986 patientsQuery1.setYn(YnEnums.YES.getId());
... ... @@ -2001,6 +2005,8 @@
2001 2005 if ((days >= 253) && days <= 258) {
2002 2006 antexListResult.setIsH("1");
2003 2007 }
  2008 +
  2009 +
2004 2010 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(antexListResult);
2005 2011 }
2006 2012  
... ... @@ -2097,6 +2103,8 @@
2097 2103 antenatalExaminationResult.setCheckDoctor(map1);
2098 2104 }
2099 2105  
  2106 +
  2107 + antenatalExaminationResult.setTreatmentOpinion2Types(examinationModel.getTreatmentOpinion2Types());
2100 2108 Map<String, List<String>> treatmentOpinion2 = examinationModel.getTreatmentOpinion2();
2101 2109 Map<String, List<Map<String, Object>>> restTreatmentOpinion2 = new HashMap<>();
2102 2110 if(MapUtils.isNotEmpty(treatmentOpinion2)) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java View file @ 1bda09e
... ... @@ -194,10 +194,10 @@
194 194  
195 195 //建立儿童隐藏档案
196 196 if (babyModel != null) {
197   - if(babyModel.getYn()!=YnEnums.YES.getId()){
  197 + if (babyModel.getYn() != YnEnums.YES.getId()) {
198 198 babyModel.setYn(YnEnums.YES.getId());
199 199 babyModel.setModified(new Date());
200   - babyModel.setEnable("0");
  200 + babyModel.setEnable("1");
201 201 babyService.updateOneBaby(babyModel, babyId);
202 202 }
203 203 }
... ... @@ -208,7 +208,7 @@
208 208 List<BabyPatientExtendEar> ears = babyPatientExtendEarService.queryBabyPatientExtendEar(earQuery);
209 209 if (CollectionUtils.isNotEmpty(ears)) {
210 210 BabyPatientExtendEar ear = ears.get(0);
211   - if(ear.getStatus()!=YnEnums.YES.getId()){
  211 + if (ear.getStatus() != YnEnums.YES.getId()) {
212 212 ear.setStatus(YnEnums.YES.getId());
213 213 babyPatientExtendEarService.updateBabyPatientExtendEar(ear);
214 214 }
215 215  
216 216  
217 217  
218 218  
219 219  
220 220  
221 221  
222 222  
223 223  
224 224  
225 225  
226 226  
227 227  
228 228  
229 229  
... ... @@ -228,78 +228,83 @@
228 228 BabyModel babyModel = babyService.getOneBabyById(babyId);
229 229  
230 230 //隐藏档案儿童Id
231   - String newBabyId = "";
  231 + String newBabyId = babyId;
232 232 //建立儿童隐藏档案
233 233 if (babyModel != null) {
234   - //如果相同，不建立
235   - if (!babyModel.getHospitalId().equals(hospitalId)) {
  234 + BabyModelQuery babyQuery = new BabyModelQuery();
  235 + babyQuery.setHospitalId(hospitalId);
  236 + babyQuery.setPid(babyModel.getPid());
  237 +
  238 + List<BabyModel> babyModels = babyService.queryBabyWithQuery(babyQuery);
  239 + if (CollectionUtils.isEmpty(babyModels)) {
236 240 babyModel.setHospitalId(hospitalId);
237   - babyModel.setYn(YnEnums.NO.getId());
  241 + babyModel.setYn(YnEnums.YES.getId());
238 242 babyModel.setCreated(new Date());
239 243 babyModel.setId(null);
240   - babyModel.setEnable("1");
  244 + babyModel.setEnable("0");
  245 + babyModel.setBuildType(3);
241 246 babyModel.setBuildDoctor(null);
242 247 babyModel.setBuildDate(new Date());
243 248 newBabyId = babyService.addOneBaby(babyModel).getId();
244   - } else {
245   - newBabyId = babyModel.getId();
246 249 }
247   - }
248 250  
249   - BabyPatientExtendEarQuery earQuery = new BabyPatientExtendEarQuery();
250   - earQuery.setBabyPatientId(babyId);
  251 + BabyPatientExtendEarQuery earQuery = new BabyPatientExtendEarQuery();
  252 + earQuery.setBabyPatientId(babyId);
251 253  
252   - List<BabyPatientExtendEar> ears = babyPatientExtendEarService.queryBabyPatientExtendEar(earQuery);
253   - if (CollectionUtils.isNotEmpty(ears)) {
254   - BabyPatientExtendEar ear = ears.get(0);
255   - //如果相同，则已经存在，不处理
256   - if (!newBabyId.equals(babyId)) {
257   - ear.setId(UUID.randomUUID().toString().replace("-", ""));
258   - ear.setBabyPatientId(newBabyId);
259   - ear.setStatus(YnEnums.NO.getId());
260   - babyPatientExtendEarService.addBabyPatientExtendEar(ear);
  254 + List<BabyPatientExtendEar> ears = babyPatientExtendEarService.queryBabyPatientExtendEar(earQuery);
  255 + if (CollectionUtils.isNotEmpty(ears)) {
  256 + BabyPatientExtendEar ear = ears.get(0);
  257 + //如果相同，则已经存在，不处理
  258 + if (!newBabyId.equals(babyId)) {
  259 + ear.setId(UUID.randomUUID().toString().replace("-", ""));
  260 + ear.setBabyPatientId(newBabyId);
  261 + ear.setStatus(YnEnums.NO.getId());
  262 + babyPatientExtendEarService.addBabyPatientExtendEar(ear);
261 263  
262   - //儿童基本信息
263   - BabyPatientExtendEarBirthQuery earBirthQuery = new BabyPatientExtendEarBirthQuery();
264   - earBirthQuery.setBabyPatientId(babyId);
  264 + //儿童基本信息
  265 + BabyPatientExtendEarBirthQuery earBirthQuery = new BabyPatientExtendEarBirthQuery();
  266 + earBirthQuery.setBabyPatientId(babyId);
265 267  
266   - List<BabyPatientExtendEarBirth> earBirths = babyPatientExtendEarBirthService.queryBabyPatientExtendEarBirth(earBirthQuery);
267   - if (CollectionUtils.isNotEmpty(earBirths)) {
268   - BabyPatientExtendEarBirth earBirth = earBirths.get(0);
269   - earBirth.setId(UUID.randomUUID().toString().replace("-", ""));
270   - earBirth.setBabyPatientId(newBabyId);
271   - earBirth.setBabyEarId(ear.getId());
272   - babyPatientExtendEarBirthService.addBabyPatientExtendEarBirth(earBirth);
273   - }
  268 + List<BabyPatientExtendEarBirth> earBirths = babyPatientExtendEarBirthService.queryBabyPatientExtendEarBirth(earBirthQuery);
  269 + if (CollectionUtils.isNotEmpty(earBirths)) {
  270 + BabyPatientExtendEarBirth earBirth = earBirths.get(0);
  271 + earBirth.setId(UUID.randomUUID().toString().replace("-", ""));
  272 + earBirth.setBabyPatientId(newBabyId);
  273 + earBirth.setBabyEarId(ear.getId());
  274 + babyPatientExtendEarBirthService.addBabyPatientExtendEarBirth(earBirth);
  275 + }
274 276  
275   - //儿童家庭信息
276   - BabyPatientExtendEarFamilyQuery familyQuery = new BabyPatientExtendEarFamilyQuery();
277   - familyQuery.setBabyPatientId(babyId);
  277 + //儿童家庭信息
  278 + BabyPatientExtendEarFamilyQuery familyQuery = new BabyPatientExtendEarFamilyQuery();
  279 + familyQuery.setBabyPatientId(babyId);
278 280  
279   - List<BabyPatientExtendEarFamily> families = babyPatientExtendEarFamilyService.queryBabyPatientExtendEarFamily(familyQuery);
280   - if (CollectionUtils.isNotEmpty(families)) {
281   - BabyPatientExtendEarFamily family = families.get(0);
282   - family.setId(UUID.randomUUID().toString().replace("-", ""));
283   - family.setBabyPatientId(newBabyId);
284   - family.setBabyEarId(ear.getId());
285   - babyPatientExtendEarFamilyService.addBabyPatientExtendEarFamily(family);
286   - }
  281 + List<BabyPatientExtendEarFamily> families = babyPatientExtendEarFamilyService.queryBabyPatientExtendEarFamily(familyQuery);
  282 + if (CollectionUtils.isNotEmpty(families)) {
  283 + BabyPatientExtendEarFamily family = families.get(0);
  284 + family.setId(UUID.randomUUID().toString().replace("-", ""));
  285 + family.setBabyPatientId(newBabyId);
  286 + family.setBabyEarId(ear.getId());
  287 + babyPatientExtendEarFamilyService.addBabyPatientExtendEarFamily(family);
  288 + }
287 289  
288   - //儿童家庭信息
289   - BabyPatientExtendEarMotherQuery motherQuery = new BabyPatientExtendEarMotherQuery();
290   - motherQuery.setBabyPatientId(babyId);
  290 + //儿童家庭信息
  291 + BabyPatientExtendEarMotherQuery motherQuery = new BabyPatientExtendEarMotherQuery();
  292 + motherQuery.setBabyPatientId(babyId);
291 293  
292   - List<BabyPatientExtendEarMother> mothers = babyPatientExtendEarMotherService.queryBabyPatientExtendEarMother(motherQuery);
293   - if (CollectionUtils.isNotEmpty(mothers)) {
294   - BabyPatientExtendEarMother mother = mothers.get(0);
295   - mother.setId(UUID.randomUUID().toString().replace("-", ""));
296   - mother.setBabyPatientId(newBabyId);
297   - mother.setBabyEarId(ear.getId());
298   - babyPatientExtendEarMotherService.addBabyPatientExtendEarMother(mother);
  294 + List<BabyPatientExtendEarMother> mothers = babyPatientExtendEarMotherService.queryBabyPatientExtendEarMother(motherQuery);
  295 + if (CollectionUtils.isNotEmpty(mothers)) {
  296 + BabyPatientExtendEarMother mother = mothers.get(0);
  297 + mother.setId(UUID.randomUUID().toString().replace("-", ""));
  298 + mother.setBabyPatientId(newBabyId);
  299 + mother.setBabyEarId(ear.getId());
  300 + babyPatientExtendEarMotherService.addBabyPatientExtendEarMother(mother);
  301 + }
299 302 }
300 303 }
  304 + return true;
  305 + } else {
  306 + return false;
301 307 }
302   - return true;
303 308 }
304 309  
305 310  
... ... @@ -497,7 +502,7 @@
497 502 List<BabyPatientExtendEarMother> babyPatientExtendEarMothers = babyPatientExtendEarMotherService.queryBabyPatientExtendEarMother(babyPatientExtendEarMotherQuery);
498 503 if (CollectionUtils.isNotEmpty(babyPatientExtendEarMothers)) {
499 504 babyEarResult.setPatientExtendEarMother(babyPatientExtendEarMothers.get(0));
500   - }else{
  505 + } else {
501 506 BabyPatientExtendEarMother babyPatientExtendEarMother = new BabyPatientExtendEarMother();
502 507 babyPatientExtendEarMother.setAbortionHistoryType("{}");
503 508 babyPatientExtendEarMother.setViralInfectionHistoryType("{}");
... ... @@ -519,7 +524,7 @@
519 524 List<BabyPatientExtendEarFamily> babyPatientExtendEarFamilies = babyPatientExtendEarFamilyService.queryBabyPatientExtendEarFamily(babyPatientExtendEarFamilyQuery);
520 525 if (CollectionUtils.isNotEmpty(babyPatientExtendEarFamilies)) {
521 526 babyEarResult.setPatientExtendEarFamily(babyPatientExtendEarFamilies.get(0));
522   - }else{
  527 + } else {
523 528 BabyPatientExtendEarFamily family = new BabyPatientExtendEarFamily();
524 529 family.setBadLifeHistory("{}");
525 530 family.setDeatRelationship("{}");
... ... @@ -532,7 +537,7 @@
532 537  
533 538 if (CollectionUtils.isNotEmpty(babyPatientExtendEarBirths)) {
534 539 babyEarResult.setBabyBirth(babyPatientExtendEarBirths.get(0));
535   - }else{
  540 + } else {
536 541 babyEarResult.setBabyBirth(new BabyPatientExtendEarBirth());
537 542 }
538 543 objectResponse.setData(babyEarResult);
539 544  
540 545  
541 546  
542 547  
543 548  
544 549  
... ... @@ -1280,23 +1285,24 @@
1280 1285  
1281 1286 /**
1282 1287 * 获取当前医院机构里医院列表
  1288 + *
1283 1289 * @param hospitalId
1284 1290 * @return
1285 1291 */
1286   - public List<String> getOrgHospitalIds(String hospitalId){
  1292 + public List<String> getOrgHospitalIds(String hospitalId) {
1287 1293 List<String> hospitalIds = new ArrayList<>();
1288   - String groupId= groupsFacade.findItemIdByCurrentUserId(hospitalId);
1289   - if(org.apache.commons.lang.StringUtils.isNotEmpty(groupId)) {
  1294 + String groupId = groupsFacade.findItemIdByCurrentUserId(hospitalId);
  1295 + if (org.apache.commons.lang.StringUtils.isNotEmpty(groupId)) {
1290 1296 OrganizationGroupsItems groupsItems = groupsFacade.findById(groupId);
1291   - if (groupsItems!=null) {
  1297 + if (groupsItems != null) {
1292 1298 List<Integer> hIds = groupsItems.gethId();
1293   - for(Integer hd:hIds){
  1299 + for (Integer hd : hIds) {
1294 1300 hospitalIds.add(String.valueOf(hd));
1295 1301 }
1296   - }else{
  1302 + } else {
1297 1303 hospitalIds.add(hospitalId);
1298 1304 }
1299   - }else{
  1305 + } else {
1300 1306 hospitalIds.add(hospitalId);
1301 1307 }
1302 1308  
... ... @@ -1309,7 +1315,7 @@
1309 1315 * @param babyId 听力筛查id
1310 1316 * @return
1311 1317 */
1312   - public BaseResponse findBabyEarSrc(String babyId,Integer userId) {
  1318 + public BaseResponse findBabyEarSrc(String babyId, Integer userId) {
1313 1319 BabyPatientExtendEarScreenQuery query = new BabyPatientExtendEarScreenQuery();
1314 1320 query.setBabyId(babyId);
1315 1321 query.setStatus(0);
... ... @@ -1317,7 +1323,7 @@
1317 1323 //当前登录人医院Id
1318 1324 String hospitalId = autoMatchFacade.getHospitalId(userId);
1319 1325 List hospitalIds = getOrgHospitalIds(hospitalId);
1320   - String[] checkHospitalIds = (String[])hospitalIds.toArray(new String[hospitalIds.size()]);
  1326 + String[] checkHospitalIds = (String[]) hospitalIds.toArray(new String[hospitalIds.size()]);
1321 1327 query.setCheckHospitalIds(checkHospitalIds);
1322 1328 List<BabyPatientExtendEarScreen> babyPatientExtendEarScreens = babyPatientExtendEarScreenService.queryBabyPatientExtendEarScreen(query);
1323 1329  
1324 1330  
1325 1331  
1326 1332  
1327 1333  
1328 1334  
1329 1335  
1330 1336  
1331 1337  
1332 1338  
1333 1339  
1334 1340  
1335 1341  
... ... @@ -1369,31 +1375,31 @@
1369 1375 data.put("highRiskCauseStr", hfBuff.toString());
1370 1376 data.put("highRiskCause", highArr);
1371 1377 }
1372   - data.put("oaeLeft", babyPatientExtendEarScreen.getOaeLeft()==null?"":babyPatientExtendEarScreen.getOaeLeft());
  1378 + data.put("oaeLeft", babyPatientExtendEarScreen.getOaeLeft() == null ? "" : babyPatientExtendEarScreen.getOaeLeft());
1373 1379 data.put("oaeLeftStr", BabyEarResultEnums.getTitle(babyPatientExtendEarScreen.getOaeLeft() == null ? 0 : babyPatientExtendEarScreen.getOaeLeft()));
1374   - data.put("oaeRight", babyPatientExtendEarScreen.getOaeRight()==null?"":babyPatientExtendEarScreen.getOaeRight());
  1380 + data.put("oaeRight", babyPatientExtendEarScreen.getOaeRight() == null ? "" : babyPatientExtendEarScreen.getOaeRight());
1375 1381 data.put("oaeRightStr", BabyEarResultEnums.getTitle(babyPatientExtendEarScreen.getOaeRight() == null ? 0 : babyPatientExtendEarScreen.getOaeRight()));
1376   - data.put("aabrLeft", babyPatientExtendEarScreen.getAabrLeft()==null?"":babyPatientExtendEarScreen.getAabrLeft());
  1382 + data.put("aabrLeft", babyPatientExtendEarScreen.getAabrLeft() == null ? "" : babyPatientExtendEarScreen.getAabrLeft());
1377 1383 data.put("aabrLeftStr", BabyEarResultEnums.getTitle(babyPatientExtendEarScreen.getAabrLeft() == null ? 0 : babyPatientExtendEarScreen.getAabrLeft()));
1378   - data.put("aabrRight", babyPatientExtendEarScreen.getAabrRight()==null?"":babyPatientExtendEarScreen.getAabrRight());
  1384 + data.put("aabrRight", babyPatientExtendEarScreen.getAabrRight() == null ? "" : babyPatientExtendEarScreen.getAabrRight());
1379 1385 data.put("aabrRightStr", BabyEarResultEnums.getTitle(babyPatientExtendEarScreen.getAabrRight() == null ? 0 : babyPatientExtendEarScreen.getAabrRight()));
1380   - data.put("gjb2Del35", babyPatientExtendEarScreen.getGjb2Del35() ==null?"":babyPatientExtendEarScreen.getGjb2Del35());
  1386 + data.put("gjb2Del35", babyPatientExtendEarScreen.getGjb2Del35() == null ? "" : babyPatientExtendEarScreen.getGjb2Del35());
1381 1387 data.put("gjb2Del35Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb2Del35() == null ? 0 : babyPatientExtendEarScreen.getGjb2Del35()));
1382   - data.put("gjb2Del176", babyPatientExtendEarScreen.getGjb2Del176() ==null?"":babyPatientExtendEarScreen.getGjb2Del176());
  1388 + data.put("gjb2Del176", babyPatientExtendEarScreen.getGjb2Del176() == null ? "" : babyPatientExtendEarScreen.getGjb2Del176());
1383 1389 data.put("gjb2Del176Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb2Del176() == null ? 0 : babyPatientExtendEarScreen.getGjb2Del176()));
1384   - data.put("gjb2Del235", babyPatientExtendEarScreen.getGjb2Del235() ==null?"":babyPatientExtendEarScreen.getGjb2Del235());
  1390 + data.put("gjb2Del235", babyPatientExtendEarScreen.getGjb2Del235() == null ? "" : babyPatientExtendEarScreen.getGjb2Del235());
1385 1391 data.put("gjb2Del235Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb2Del235() == null ? 0 : babyPatientExtendEarScreen.getGjb2Del235()));
1386   - data.put("gjb2Del299", babyPatientExtendEarScreen.getGjb2Del299()==null?"":babyPatientExtendEarScreen.getGjb2Del299());
  1392 + data.put("gjb2Del299", babyPatientExtendEarScreen.getGjb2Del299() == null ? "" : babyPatientExtendEarScreen.getGjb2Del299());
1387 1393 data.put("gjb2Del299Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb2Del299() == null ? 0 : babyPatientExtendEarScreen.getGjb2Del299()));
1388   - data.put("gjb3Slc26a4538", babyPatientExtendEarScreen.getGjb3Slc26a4538() ==null?"":babyPatientExtendEarScreen.getGjb3Slc26a4538());
  1394 + data.put("gjb3Slc26a4538", babyPatientExtendEarScreen.getGjb3Slc26a4538() == null ? "" : babyPatientExtendEarScreen.getGjb3Slc26a4538());
1389 1395 data.put("gjb3Slc26a4538Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb3Slc26a4538() == null ? 0 : babyPatientExtendEarScreen.getGjb3Slc26a4538()));
1390   - data.put("gjb3Slc26a42168", babyPatientExtendEarScreen.getGjb3Slc26a42168() ==null?"":babyPatientExtendEarScreen.getGjb3Slc26a42168());
  1396 + data.put("gjb3Slc26a42168", babyPatientExtendEarScreen.getGjb3Slc26a42168() == null ? "" : babyPatientExtendEarScreen.getGjb3Slc26a42168());
1391 1397 data.put("gjb3Slc26a42168Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb3Slc26a42168() == null ? 0 : babyPatientExtendEarScreen.getGjb3Slc26a42168()));
1392   - data.put("gjb3Slc26a4Ivs7", babyPatientExtendEarScreen.getGjb3Slc26a4Ivs7() ==null?"":babyPatientExtendEarScreen.getGjb3Slc26a4Ivs7());
  1398 + data.put("gjb3Slc26a4Ivs7", babyPatientExtendEarScreen.getGjb3Slc26a4Ivs7() == null ? "" : babyPatientExtendEarScreen.getGjb3Slc26a4Ivs7());
1393 1399 data.put("gjb3Slc26a4Ivs7Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb3Slc26a4Ivs7() == null ? 0 : babyPatientExtendEarScreen.getGjb3Slc26a4Ivs7()));
1394   - data.put("rrna1494", babyPatientExtendEarScreen.getRrna1494()==null?"":babyPatientExtendEarScreen.getRrna1494());
  1400 + data.put("rrna1494", babyPatientExtendEarScreen.getRrna1494() == null ? "" : babyPatientExtendEarScreen.getRrna1494());
1395 1401 data.put("rrna1494Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getRrna1494() == null ? 0 : babyPatientExtendEarScreen.getRrna1494()));
1396   - data.put("rrna1555", babyPatientExtendEarScreen.getRrna1555() ==null?"":babyPatientExtendEarScreen.getRrna1555());
  1402 + data.put("rrna1555", babyPatientExtendEarScreen.getRrna1555() == null ? "" : babyPatientExtendEarScreen.getRrna1555());
1397 1403 data.put("rrna1555Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getRrna1555() == null ? 0 : babyPatientExtendEarScreen.getRrna1555()));
1398 1404 data.put("processOptionType", babyPatientExtendEarScreen.getProcessOptionType());//1=复筛 2=诊断
1399 1405 data.put("processOptionTypeStr", babyPatientExtendEarScreen.getProcessOptionType() == null ? "初诊" : babyPatientExtendEarScreen.getProcessOptionType() == 1 ? "复筛" : "诊断");//1=复筛 2=诊断
... ... @@ -1520,7 +1526,7 @@
1520 1526 * @param earScreenListRequest
1521 1527 * @return
1522 1528 */
1523   - public BaseResponse findListBabyEarSrc(EarScreenListRequest earScreenListRequest,Integer userId) {
  1529 + public BaseResponse findListBabyEarSrc(EarScreenListRequest earScreenListRequest, Integer userId) {
1524 1530 BabyPatientExtendEarScreenQuery screenQuery = new BabyPatientExtendEarScreenQuery();
1525 1531 screenQuery.setSrcStartTime(earScreenListRequest.getSrcStartTime());
1526 1532 screenQuery.setSrcEndTime(earScreenListRequest.getSrcEndTime());
... ... @@ -1534,7 +1540,7 @@
1534 1540 //当前登录人医院Id
1535 1541 String hospitalId = autoMatchFacade.getHospitalId(userId);
1536 1542 List hospitalIds = getOrgHospitalIds(hospitalId);
1537   - String[] checkHospitalIds = (String[])hospitalIds.toArray(new String[hospitalIds.size()]);
  1543 + String[] checkHospitalIds = (String[]) hospitalIds.toArray(new String[hospitalIds.size()]);
1538 1544 screenQuery.setCheckHospitalIds(checkHospitalIds);
1539 1545  
1540 1546 //如果查询号不为空，根据查询号查询儿童档案表，获取儿童档案Id
1541 1547  
1542 1548  
... ... @@ -1543,13 +1549,13 @@
1543 1549 babyQuery.setQueryNo(earScreenListRequest.getKeyWord());
1544 1550 //查询建档记录
1545 1551 List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
1546   - if(CollectionUtils.isNotEmpty(models)){
  1552 + if (CollectionUtils.isNotEmpty(models)) {
1547 1553 List<String> babyIds = new ArrayList<>();
1548   - for(BabyModel babyModel:models){
  1554 + for (BabyModel babyModel : models) {
1549 1555 babyIds.add(babyModel.getId());
1550 1556 }
1551 1557 screenQuery.setBabyIds(babyIds.toArray(new String[babyIds.size()]));
1552   - }else{
  1558 + } else {
1553 1559 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有找到数据");
1554 1560 }
1555 1561 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 1bda09e
... ... @@ -1117,6 +1117,10 @@
1117 1117 }
1118 1118  
1119 1119 Map<String, Object> map = new HashMap<>();
  1120 +
  1121 + map.put("treatmentOpinion2Types", mongoUtil.findPlatValues(data.getTreatmentOpinion2Types()));
  1122 + map.put("treatmentOpinion2", mongoUtil.findPlatList(data.getTreatmentOpinion2()));
  1123 +
1120 1124 /* 基本信息 */
1121 1125 //孕妇基本信息
1122 1126 map.put("id", data.getId());
... ... @@ -1680,6 +1684,7 @@
1680 1684 map.put("ydqjd", FunvCommonUtil.getBaseicConfigByid(ydqjd, basicConfigService));
1681 1685 map.put("bChao", data.getbChao());
1682 1686  
  1687 +
1683 1688 /** 优惠券编号 */
1684 1689 map.put("couponCode", couponService.findByUsedId(id));
1685 1690  
... ... @@ -1764,6 +1769,10 @@
1764 1769 }
1765 1770  
1766 1771 Map<String, Object> map = new HashMap<>();
  1772 +
  1773 + map.put("treatmentOpinion2Types", mongoUtil.findPlatValues(data.getTreatmentOpinion2Types()));
  1774 + map.put("treatmentOpinion2", mongoUtil.findPlatList(data.getTreatmentOpinion2()));
  1775 +
1767 1776 /* 基本信息 */
1768 1777 //孕妇基本信息
1769 1778 map.put("id", data.getId());
... ... @@ -1795,18 +1804,8 @@
1795 1804 map.put("s75gdgtt", Boolean.valueOf(data.getS75gdgtt()) ? "已检查" : "未检查");
1796 1805 map.put("jzxgn", Boolean.valueOf(data.getJzxgn()) ? "已检查" : "未检查");
1797 1806  
1798   - map.put("treatmentOpinion2Types", data.getTreatmentOpinion2Types());
1799   - Map<String, List<Map<String, Object>>> restTreatmentOpinion2 = new HashMap<>();
1800   - Map<String, List<String>> treatmentOpinion2 = data.getTreatmentOpinion2();
1801   - if(MapUtils.isNotEmpty(treatmentOpinion2)) {
1802   - Iterator<Map.Entry<String, List<String>>> iterator = treatmentOpinion2.entrySet().iterator();
1803   - while (iterator.hasNext()) {
1804   - Map.Entry<String, List<String>> iter = iterator.next();
1805   - restTreatmentOpinion2.put(iter.getKey(), mongoUtil.findPlatValueList(iter.getValue()));
1806   - }
1807   - }
1808   - map.put("treatmentOpinion2", restTreatmentOpinion2);
1809   - map.put("treatmentOpinion2Types", data.getTreatmentOpinion2Types());
  1807 + map.put("treatmentOpinion2", mongoUtil.findPlatList(data.getTreatmentOpinion2()));
  1808 + map.put("treatmentOpinion2Types", mongoUtil.findPlatValues(data.getTreatmentOpinion2Types()));
1810 1809  
1811 1810 //早孕期病毒检测
1812 1811 // private String zyqbdjc;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java View file @ 1bda09e
... ... @@ -21,7 +21,9 @@
21 21 private String id;
22 22  
23 23 /** 处理意见 */
24   - private List<Map<String, Object>> treatmentOpinion2;
  24 + private List<String> treatmentOpinion2;
  25 + /** 处理意见 */
  26 + private String treatmentOpinion2Types;
25 27  
26 28 private String pid;
27 29 //名字
28 30  
... ... @@ -57,11 +59,19 @@
57 59 //<!---------基本信息----------->
58 60  
59 61  
60   - public List<Map<String, Object>> getTreatmentOpinion2() {
  62 + public String getTreatmentOpinion2Types() {
  63 + return treatmentOpinion2Types;
  64 + }
  65 +
  66 + public void setTreatmentOpinion2Types(String treatmentOpinion2Types) {
  67 + this.treatmentOpinion2Types = treatmentOpinion2Types;
  68 + }
  69 +
  70 + public List<String> getTreatmentOpinion2() {
61 71 return treatmentOpinion2;
62 72 }
63 73  
64   - public void setTreatmentOpinion2(List<Map<String, Object>> treatmentOpinion2) {
  74 + public void setTreatmentOpinion2(List<String> treatmentOpinion2) {
65 75 this.treatmentOpinion2 = treatmentOpinion2;
66 76 }
67 77  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java View file @ 1bda09e
... ... @@ -10,6 +10,7 @@
10 10 import com.lyms.platform.pojo.PlantformConfigModel;
11 11 import com.mongodb.BasicDBObject;
12 12 import com.mongodb.DBObject;
  13 +import org.apache.commons.collections.MapUtils;
13 14 import org.apache.commons.collections.map.HashedMap;
14 15 import org.springframework.beans.factory.annotation.Autowired;
15 16 import org.springframework.data.domain.Sort;
16 17  
17 18  
... ... @@ -300,19 +301,57 @@
300 301  
301 302 public List<Map<String, Object>> findPlatValueList(List<String> ids) {
302 303 if(CollectionUtils.isEmpty(ids)) {
303   - return null;
  304 + return new ArrayList<>();
304 305 }
305 306 List<Map<String, Object>> rest = new ArrayList<>();
306 307 for (String id : ids) {
307 308 PlantformConfigModel platformConfig = getPlatformConfig(id);
308 309 if(platformConfig != null) {
309 310 Map<String, Object> tempMap = new HashedMap();
310   - tempMap.put("id", platformConfig.getId());
311   - tempMap.put("name", platformConfig.getValue());
  311 + tempMap.put("id", platformConfig.getId().toString());
  312 + tempMap.put("typeName", platformConfig.getValue());
312 313 rest.add(tempMap);
313 314 }
314 315 }
315 316 return rest;
  317 + }
  318 +
  319 + public PlantformConfigModel findPlatFormById(String id) {
  320 + return mongoTemplate.findById(id, PlantformConfigModel.class);
  321 + }
  322 +
  323 + public String findPlatValues(List<String> ids) {
  324 + if(CollectionUtils.isEmpty(ids)) {
  325 + return "";
  326 + }
  327 + StringBuilder sb = new StringBuilder();
  328 + for (String id : ids) {
  329 + PlantformConfigModel plantformConfig = findPlatFormById(id);
  330 + if(plantformConfig != null) {
  331 + sb.append(plantformConfig.getValue()).append("、");
  332 + }
  333 + }
  334 + return sb.length() == 0 ? "" : sb.toString().substring(0, sb.toString().length() - 1);
  335 + }
  336 +
  337 + public String findPlatValue(String id) {
  338 + PlantformConfigModel plantformConfig = findPlatFormById(id);
  339 + return plantformConfig.getValue();
  340 + }
  341 +
  342 + public List<String> findPlatList(Map<String, List<String>> ids) {
  343 + List<String> list = new ArrayList<>();
  344 + if(MapUtils.isEmpty(ids)) {
  345 + return list;
  346 + }
  347 + Iterator<Map.Entry<String, List<String>>> iterator = ids.entrySet().iterator();
  348 + while (iterator.hasNext()) {
  349 + Map.Entry<String, List<String>> next = iterator.next();
  350 + StringBuilder sb = new StringBuilder();
  351 + sb.append(findPlatValue(next.getKey())).append(": ").append(findPlatValues(next.getValue()));
  352 + list.add(sb.toString());
  353 + }
  354 + return list;
316 355 }
317 356 }