jiangjiazhi / regional-platform

Download as
Browse Code »

Commit b0639d14bd75f12cfcdb320e5db7a7531a8c303e

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

公共卫生统计

Showing 8 changed files with 45 additions and 28 deletions

platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java View file @ b0639d1
... ... @@ -857,15 +857,15 @@
857 857 // }
858 858 // break;
859 859 /***乙肝表面抗原***/
860   -// case "HBSAG-1":
861   -// if(StringUtils.isEmpty(premaritalCheckup.getHbsag())) {
862   -// if(result.contains("阳性")) {
863   -// premaritalCheckup.setHbsag("1");
864   -// }else if(result.contains("阴性")) {
865   -// premaritalCheckup.setHbsag("2");
866   -// }
867   -// }
868   -// break;
  860 + case "HBSAG-1":
  861 + if(StringUtils.isEmpty(premaritalCheckup.getHbsag())) {
  862 + if(result.contains("阳性")) {
  863 + premaritalCheckup.setHbsag("1");
  864 + }else if(result.contains("阴性")) {
  865 + premaritalCheckup.setHbsag("2");
  866 + }
  867 + }
  868 + break;
869 869 /***转氨酶***/
870 870 case "001ALT":
871 871 if(StringUtils.isEmpty(premaritalCheckup.getAlt())) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java View file @ b0639d1
... ... @@ -5394,14 +5394,17 @@
5394 5394 organizationQuery.setStreetId(streetId);
5395 5395 organizationQuery.setId(hid);
5396 5396 List<Organization> organizations = organizationService.queryHospitals(organizationQuery);
  5397 + int count = 0;
  5398 + System.out.println("org size "+ organizations.size());
5397 5399 if (CollectionUtils.isNotEmpty(organizations))
5398 5400 {
5399 5401 for (Organization org : organizations)
5400 5402 {
5401   -
  5403 + System.out.println(org.getName()+"org count =="+count);
  5404 + count++;
5402 5405 BabyModelQuery babyModelQuery = new BabyModelQuery();
5403 5406 babyModelQuery.setYn(YnEnums.YES.getId());
5404   - babyModelQuery.setId(org.getId()+"");
  5407 + babyModelQuery.setHospitalId(org.getId()+"");
5405 5408 babyModelQuery.setLastCheckDoctor2(true);
5406 5409  
5407 5410 List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery);
5408 5411  
... ... @@ -5481,10 +5484,14 @@
5481 5484 organizationQuery.setStreetId(streetId);
5482 5485 organizationQuery.setId(hid);
5483 5486 List<Organization> organizations = organizationService.queryHospitals(organizationQuery);
  5487 + System.out.println("org size "+ organizations.size());
  5488 + int count = 1;
5484 5489 if (CollectionUtils.isNotEmpty(organizations))
5485 5490 {
5486 5491 for (Organization org : organizations)
5487 5492 {
  5493 + System.out.println(org.getName()+"org count =="+count);
  5494 + count++;
5488 5495 PatientsQuery patientsQuery=new PatientsQuery();
5489 5496 patientsQuery.setYn(YnEnums.YES.getId());
5490 5497 patientsQuery.setHospitalId(org.getId()+"");
5491 5498  
... ... @@ -5497,9 +5504,7 @@
5497 5504 patientsQuery.setPostViewTimesStart(1);
5498 5505 patientsQuery.setPostViewTimesEnd(10);
5499 5506  
5500   -
5501 5507 List<Patients> models = patientsService.queryPatient(patientsQuery);
5502   - System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString());
5503 5508 System.out.println("updatePregCompleteCheck="+org.getName()+"; patients = "+models.size());
5504 5509 if (CollectionUtils.isNotEmpty(models)) {
5505 5510 for (Patients patients : models) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ b0639d1
... ... @@ -6523,7 +6523,7 @@
6523 6523 int bc = (int)mongoTemplate.count(Query.query(criteria6), AntExChuModel.class);
6524 6524  
6525 6525  
6526   - Criteria criteria7 = Criteria.where("hospitalId").is(hospitalId).and("tx").exists(true);
  6526 + Criteria criteria7 = Criteria.where("hospitalId").is(hospitalId).and("placentas.heartRate").exists(true);
6527 6527 if (startDate != null)
6528 6528 {
6529 6529 criteria7.and("checkTime").gte(startDate).lte(endDate);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java View file @ b0639d1
... ... @@ -3308,8 +3308,9 @@
3308 3308 //累计活产数
3309 3309 babyModelQuery.setBirthStart(null);
3310 3310 int data2 = (int)mongoTemplate.count(babyModelQuery.convertToQuery().convertToMongoQuery(),BabyModel.class);
3311   -
  3311 + System.out.println("======"+data2);
3312 3312 int lastDate2= null==hospitalDate.get("data2")?0:Integer.parseInt(hospitalDate.get("data2").toString());
  3313 +
3313 3314 hospitalDate.put("data2",data2+lastDate2);
3314 3315  
3315 3316  
... ... @@ -4326,6 +4327,9 @@
4326 4327 {
4327 4328 patientsQuery.setHospitalList(hospitalIds);
4328 4329 patientsQuery.setIsComplete(2);
  4330 + patientsQuery.setPage(page);
  4331 + patientsQuery.setLimit(limit);
  4332 + patientsQuery.setNeed("true");
4329 4333 List<Patients> datas = patientsService.queryPatient(patientsQuery);
4330 4334 System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString());
4331 4335 if (CollectionUtils.isNotEmpty(datas))
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java View file @ b0639d1
... ... @@ -439,18 +439,18 @@
439 439 query.setYn(YnEnums.YES.getId());
440 440 query.setHospitalId(addRequest.getHospitalId());
441 441  
442   - if (StringUtils.isNotEmpty(addRequest.getCertificateNum())) {
443   - //判断该证件号码是否在该医院建档
444   - query.setCertificateNum(addRequest.getCertificateNum());
445   - query.setCertificateTypeId(addRequest.getCertificateTypeId());
446   - query.setType(addRequest.getType());
447   - List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(query);
448   - if (CollectionUtils.isNotEmpty(modelList)) {
449   - br.setErrorcode(ErrorCodeConstants.DATA_EXIST);
450   - br.setErrormsg("该证件号在医院已经建档");
451   - return br;
452   - }
453   - }
  442 +// if (StringUtils.isNotEmpty(addRequest.getCertificateNum())) {
  443 +// //判断该证件号码是否在该医院建档
  444 +// query.setCertificateNum(addRequest.getCertificateNum());
  445 +// query.setCertificateTypeId(addRequest.getCertificateTypeId());
  446 +// query.setType(addRequest.getType());
  447 +// List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(query);
  448 +// if (CollectionUtils.isNotEmpty(modelList)) {
  449 +// br.setErrorcode(ErrorCodeConstants.DATA_EXIST);
  450 +// br.setErrormsg("该证件号在医院已经建档");
  451 +// return br;
  452 +// }
  453 +// }
454 454  
455 455  
456 456 //保存建档数据
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java View file @ b0639d1
... ... @@ -1514,6 +1514,10 @@
1514 1514 if(CollectionUtils.isNotEmpty(riskFactor)){
1515 1515 examinationModel.setRiskFactor(JsonUtil.array2JsonString(riskFactor));
1516 1516 }
  1517 + else if (riskFactor != null && riskFactor.size() ==0)
  1518 + {
  1519 + examinationModel.setRiskFactor("[]");
  1520 + }
1517 1521 examinationModel.setRiskScore(riskScore);
1518 1522 if (CollectionUtils.isNotEmpty(otherRisk)) {
1519 1523 examinationModel.setOtherRisk(JsonUtil.array2JsonString(otherRisk));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java View file @ b0639d1
... ... @@ -2566,6 +2566,10 @@
2566 2566 if (CollectionUtils.isNotEmpty(otherHighRisk)) {
2567 2567 antExChuModel.setOtherHighRisk(JsonUtil.array2JsonString(otherHighRisk));
2568 2568 }
  2569 + else if (otherHighRisk != null && otherHighRisk.size() == 0)
  2570 + {
  2571 + antExChuModel.setOtherHighRisk("[]");
  2572 + }
2569 2573 if (null != diagnosis) {
2570 2574 antExChuModel.setDiagnosis(JsonUtil.array2JsonString(diagnosis));
2571 2575 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java View file @ b0639d1
... ... @@ -5517,7 +5517,7 @@
5517 5517  
5518 5518 Map<String, String> cnames = new LinkedHashMap<>();
5519 5519 cnames.put("name", "姓名"); //姓名
5520   - cnames.put("phone", "建档孕周"); //电话
  5520 + cnames.put("phone", "电话"); //电话
5521 5521 cnames.put("cardNo", "身份证号"); //身份证号
5522 5522 cnames.put("address", "居住地址"); //居住地址
5523 5523 cnames.put("created", "建档时间"); //建档时间