jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 02b3aae9196638462a6c448746e89c29abb5fcd5

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

荣成接口

Showing 4 changed files with 18 additions and 8 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/AddressUtil.java View file @ 02b3aae
... ... @@ -47,7 +47,7 @@
47 47 }
48 48  
49 49 public static void main(String[] ages) {
50   - List<String> addrs = AddressUtil.getAddress("四川省成都市武侯区双楠路23号");
  50 + List<String> addrs = AddressUtil.getAddress("山东省荣成市曙光东区26号207室");
51 51 for (String ad : addrs) {
52 52 System.out.println(ad);
53 53 }
platform-operate-api/src/main/java/com/lyms/hospitalapi/rcfy/RcGlxtService.java View file @ 02b3aae
... ... @@ -86,7 +86,7 @@
86 86 private static Map<String,String> CHECK_TYPE = new HashMap<>();
87 87 static{
88 88 hospitalsMap.put("2100001785","371082007011");//荣成市人民医院
89   - hospitalsMap.put("216","216");//测试用的秦皇岛医院
  89 +// hospitalsMap.put("216","216");//测试用的秦皇岛医院
90 90 hospitalsMap.put("2100001818","371082006011");//荣成市石岛人民医院
91 91 hospitalsMap.put("2100001773","371082006011");//荣成市石岛人民医院
92 92 hospitalsMap.put("2100001772","371082007001");//荣成市中医院
... ... @@ -174,7 +174,7 @@
174 174 diagnosis+=model.getDiagnosisOther();
175 175 }
176 176 ps.setString(5, diagnosis);
177   - ps.setString(6, model.getTreatmentOpinion());
  177 + ps.setString(6, model.getGuide());
178 178 ps.setString(7, StringUtils.isNum(model.getCheckDoctor()) ? CommonsHelper.getUserName(model.getCheckDoctor(), usersService) : model.getCheckDoctor());
179 179 ps.setTimestamp(8, new Timestamp(model.getCheckDate().getTime()));
180 180 ps.setString(9, hospitalsMap.get(model.getHospitalId()));
... ... @@ -256,7 +256,7 @@
256 256 }
257 257 ps.setString(5, diagnosis);
258 258  
259   - ps.setString(6, model.getTreatOpinion());
  259 + ps.setString(6, model.getDirOpinion());
260 260 ps.setString(7, StringUtils.isNum(model.getProdDoctor()) ? CommonsHelper.getUserName(model.getProdDoctor(), usersService) : model.getProdDoctor());
261 261 ps.setTimestamp(8, new Timestamp(model.getCheckTime().getTime()));
262 262 ps.setString(9, hospitalsMap.get(model.getHospitalId()));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java View file @ 02b3aae
... ... @@ -2621,7 +2621,7 @@
2621 2621 AntExChuQuery antExChuQuery = new AntExChuQuery();
2622 2622 antExChuQuery.setYn(YnEnums.YES.getId());
2623 2623 antExChuQuery.setHospitalList(rcGlxtService.getHids());
2624   - antExChuQuery.setCreatedTimeStart(DateUtil.addMonth(new Date(), -50));
  2624 + antExChuQuery.setCreatedTimeStart(DateUtil.addMonth(new Date(), -5));
2625 2625 antExChuQuery.setCreatedTimeEnd(new Date());
2626 2626 List<AntExChuModel> antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery);
2627 2627 if (CollectionUtils.isNotEmpty(antExChuModels))
... ... @@ -2644,7 +2644,7 @@
2644 2644 AntExChuQuery antExChuQuery = new AntExChuQuery();
2645 2645 antExChuQuery.setYn(YnEnums.YES.getId());
2646 2646 antExChuQuery.setHospitalList(rcGlxtService.getHids());
2647   - antExChuQuery.setCreatedTimeStart(DateUtil.addMonth(new Date(), -50));
  2647 + antExChuQuery.setCreatedTimeStart(DateUtil.addMonth(new Date(), -5));
2648 2648 antExChuQuery.setCreatedTimeEnd(new Date());
2649 2649 List<AntExChuModel> antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery);
2650 2650 if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(antExChuModels)) {
... ... @@ -2657,7 +2657,7 @@
2657 2657 AntExQuery antExQuery = new AntExQuery();
2658 2658 antExQuery.setYn(YnEnums.YES.getId());
2659 2659 antExQuery.setHospitalIds(rcGlxtService.getHids());
2660   - antExQuery.setModifiedStart(DateUtil.addMonth(new Date(), -50));
  2660 + antExQuery.setModifiedStart(DateUtil.addMonth(new Date(), -5));
2661 2661 antExQuery.setModifiedEnd(new Date());
2662 2662 List<AntenatalExaminationModel> antEx = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery());
2663 2663 if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(antEx))
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 02b3aae
... ... @@ -2566,7 +2566,12 @@
2566 2566 map.put("address", CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(),
2567 2567 patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService));
2568 2568  
2569   - //父亲姓名
  2569 +
  2570 + //户籍地址
  2571 + String addressRegister = CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(),
  2572 + patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService);
  2573 + map.put("maddressRegister",addressRegister);
  2574 + //父亲姓名
2570 2575 map.put("hname",patients.getHusbandName());
2571 2576 //父亲国籍
2572 2577 map.put("fatherCountry", getBasicConfig(patients.getHcountryId()));
... ... @@ -2576,6 +2581,11 @@
2576 2581 map.put("fcardtype", getBasicConfig(patients.getHcertificateTypeId()));
2577 2582 //父亲证件号码
2578 2583 map.put("fcardnum", StringUtils.isNotEmpty(patients.getHcertificateNum()) ? patients.getHcertificateNum() : "");
  2584 +
  2585 +
  2586 + String haddressRegister = CommonsHelper.getResidence(patients.getHprovinceRegisterId(), patients.getHcityRegisterId(),
  2587 + patients.getHareaRegisterId(), patients.getHstreetRegisterId(), patients.getHaddressRegister(), basicConfigService);
  2588 + map.put("haddressRegister",haddressRegister);
2579 2589  
2580 2590 //高危因素
2581 2591 // HighScoreResult highScoreResult = null;