jiangjiazhi / regional-platform

Download as
Browse Code »

Commit f8c216eedde8e205d91e071971911539f8ccbd7f

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

隆化上传修改

Showing 4 changed files with 42 additions and 26 deletions

platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java View file @ f8c216e
... ... @@ -129,7 +129,7 @@
129 129 public void autoInLis()
130 130 {
131 131 Query query = new Query();
132   - Date start = DateUtil.addDay(new Date(),-38);
  132 + Date start = DateUtil.addDay(new Date(),-15);
133 133 query.addCriteria(Criteria.where("fillDate").gte(start).and("hospitalId").is("2100001605"));//隆化定制
134 134 // MongoCondition c = MongoCondition.newInstance();
135 135 // MongoCondition con1 = MongoCondition.newInstance("isUploadingProvince", 0, MongoOper.IS);
136 136  
... ... @@ -497,11 +497,19 @@
497 497 }
498 498 }
499 499 }
500   - wifeClinicalCheck.put("bdjc",hasValIntArry(bdjc) ? bdjc : wifeClinicalCheck.get("bdjc"));
501   - wifeClinicalCheck.put("xxbfx",hasValStrArry(xxbfx) ? xxbfx : wifeClinicalCheck.get("xxbfx"));
502   - wifeClinicalCheck.put("yigan",hasValIntArry(yigan) ? yigan : wifeClinicalCheck.get("yigan"));
  500 + if(hasValIntArry(bdjc))
  501 + {
  502 + wifeClinicalCheck.put("bdjc", bdjc);
  503 + }
  504 + if(hasValStrArry(xxbfx))
  505 + {
  506 + wifeClinicalCheck.put("xxbfx", xxbfx);
  507 + }
  508 + if(hasValIntArry(yigan))
  509 + {
  510 + wifeClinicalCheck.put("yigan",yigan);
  511 + }
503 512 wifeClinicalCheck.put("ncg",ncg);
504   -
505 513 preEugenicsBaseModel.setWifeClinicalCheck(wifeClinicalCheck);
506 514 }
507 515  
... ... @@ -651,7 +659,11 @@
651 659 }
652 660 }
653 661 }
654   - husbandClinicalCheck.put("yigan",hasValIntArry(hyigan) ? hyigan : husbandClinicalCheck.get("yigan"));
  662 + if (hasValIntArry(hyigan))
  663 + {
  664 + husbandClinicalCheck.put("yigan", hyigan);
  665 + }
  666 +
655 667 husbandClinicalCheck.put("ncg",hncg);
656 668 preEugenicsBaseModel.setHusbandClinicalCheck(husbandClinicalCheck);
657 669 }
658 670  
... ... @@ -1461,15 +1473,15 @@
1461 1473 * 孕前优生-上传省平台定时任务
1462 1474 */
1463 1475 public void uploadingProvinceTask(){
1464   - Date start = DateUtil.addDay(new Date(),-30);//当前时间30天前
  1476 + Date start = DateUtil.addDay(new Date(),-15);//当前时间30天前
1465 1477 Query query = new Query();
1466 1478 //机构
1467 1479 query.addCriteria(Criteria.where("hospitalId").is("2100001605"));
1468   - //查询上传失败或者没有上传过的
1469   - MongoCondition c = MongoCondition.newInstance();
1470   - MongoCondition con1 = MongoCondition.newInstance("isUploadingProvince", 0, MongoOper.IS);
1471   - MongoCondition con2 = MongoCondition.newInstance("isUploadingProvince",false, MongoOper.EXISTS);
1472   - query.addCriteria(c.orCondition(new MongoCondition[]{con1, con2}).getCriteria());
  1480 +// //查询上传失败或者没有上传过的
  1481 +// MongoCondition c = MongoCondition.newInstance();
  1482 +// MongoCondition con1 = MongoCondition.newInstance("isUploadingProvince", 0, MongoOper.IS);
  1483 +// MongoCondition con2 = MongoCondition.newInstance("isUploadingProvince",false, MongoOper.EXISTS);
  1484 +// query.addCriteria(c.orCondition(new MongoCondition[]{con1, con2}).getCriteria());
1473 1485 //检查结果时间
1474 1486 query.addCriteria(Criteria.where("fillDate").gte(start).lte(new Date()));
1475 1487 //只返回id字段
platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyUploadingProvince.java View file @ f8c216e
... ... @@ -974,14 +974,14 @@
974 974 physiqueCheck.setHeartRate("75");// 心率
975 975 }
976 976  
977   - if(null!=baseInfo.get("szy")){
978   - physiqueCheck.setHighBloodPressure(baseInfo.get("szy").toString());// 血压（高）
  977 + if(null!=baseInfo.get("ssy")){
  978 + physiqueCheck.setHighBloodPressure(baseInfo.get("ssy").toString());// 血压（高）
979 979 }else {
980 980 physiqueCheck.setHighBloodPressure("100");// 血压（高）
981 981 }
982 982  
983   - if(null!=baseInfo.get("ssy")){
984   - physiqueCheck.setLowBloodPressure(baseInfo.get("ssy").toString());// 血压（低）
  983 + if(null!=baseInfo.get("szy")){
  984 + physiqueCheck.setLowBloodPressure(baseInfo.get("szy").toString());// 血压（低）
985 985 }else {
986 986 physiqueCheck.setLowBloodPressure("70");// 血压（低）
987 987 }
988 988  
989 989  
... ... @@ -1369,15 +1369,19 @@
1369 1369 bCheck.setBultrasonicType("01");
1370 1370 } else if (res == 1)
1371 1371 {
  1372 +// if (bcjc.size() == 3)
  1373 +// {
  1374 +// bCheck.setBultrasonic(bcjc.get(2) == null ? "" : bcjc.get(2).toString());
  1375 +// }
1372 1376 bCheck.setBultrasonicType("02");
1373 1377 }
1374 1378 else if (res == 2)
1375 1379 {
1376 1380 bCheck.setBultrasonicType("03");
1377 1381 }
1378   - bCheck.setBultrasonicSituation(bcjc.get(1).toString());
  1382 + bCheck.setBultrasonicSituation(bcjc.get(1) == null ? "" : bcjc.get(1).toString());
1379 1383 }
1380   - bCheck.setBultrasonicNum(map.get("bcjch").toString());
  1384 + bCheck.setBultrasonicNum(map.get("bcjch") == null ? "" : map.get("bcjch").toString());
1381 1385 if(null!=map.get("doctor")){
1382 1386 Users users = usersService.getUsers(Integer.parseInt(map.get("doctor").toString()));
1383 1387 bCheck.setChecker(users.getName());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java View file @ f8c216e
... ... @@ -4968,11 +4968,11 @@
4968 4968 }
4969 4969 }
4970 4970  
4971   -// @RequestMapping(value = "/test/a", method = RequestMethod.GET)
4972   -// @ResponseBody
4973   -// public void testa() {
4974   -// //lhxfyService.uploadingProvinceTask("2100001605", DateUtil.parseYMD("2021-12-09"), DateUtil.parseYMD("2021-12-10"));
4975   -// }
  4971 + @RequestMapping(value = "/uploadProvince", method = RequestMethod.GET)
  4972 + @ResponseBody
  4973 + public void uploadProvince() {
  4974 + lhxfyService.uploadingProvinceTask();
  4975 + }
4976 4976 @RequestMapping(value = "/test/Guidelines", method = RequestMethod.GET)
4977 4977 @ResponseBody
4978 4978 public void testGuidelines() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CheckPointCountWorker.java View file @ f8c216e
... ... @@ -116,9 +116,9 @@
116 116 // antExQuery.setYn(YnEnums.YES.getId());
117 117 // int exCount = antenatalExaminationService.queryAntenatalExaminationCount(antExQuery.convertToQuery());
118 118  
119   - if (buildCount == 0 ) {
120   - continue;
121   - }
  119 +// if (buildCount == 0 ) {
  120 +// continue;
  121 +// }
122 122 List<Future> futures = new ArrayList<>();
123 123 for (int week : weeks) {
124 124 CheckWeeksNumWorker callable = new CheckWeeksNumWorker(antenatalExaminationService, hId,