diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/AddressUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/AddressUtil.java index e896457..2242821 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/AddressUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/AddressUtil.java @@ -47,7 +47,7 @@ public class AddressUtil { } public static void main(String[] ages) { - List addrs = AddressUtil.getAddress("四川省成都市武侯区双楠路23号"); + List addrs = AddressUtil.getAddress("山东省荣成市曙光东区26号207室"); for (String ad : addrs) { System.out.println(ad); } diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/rcfy/RcGlxtService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/rcfy/RcGlxtService.java index f096991..133a3c3 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/rcfy/RcGlxtService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/rcfy/RcGlxtService.java @@ -86,7 +86,7 @@ public class RcGlxtService { private static Map CHECK_TYPE = new HashMap<>(); static{ hospitalsMap.put("2100001785","371082007011");//荣成市人民医院 - hospitalsMap.put("216","216");//测试用的秦皇岛医院 +// hospitalsMap.put("216","216");//测试用的秦皇岛医院 hospitalsMap.put("2100001818","371082006011");//荣成市石岛人民医院 hospitalsMap.put("2100001773","371082006011");//荣成市石岛人民医院 hospitalsMap.put("2100001772","371082007001");//荣成市中医院 @@ -174,7 +174,7 @@ public class RcGlxtService { diagnosis+=model.getDiagnosisOther(); } ps.setString(5, diagnosis); - ps.setString(6, model.getTreatmentOpinion()); + ps.setString(6, model.getGuide()); ps.setString(7, StringUtils.isNum(model.getCheckDoctor()) ? CommonsHelper.getUserName(model.getCheckDoctor(), usersService) : model.getCheckDoctor()); ps.setTimestamp(8, new Timestamp(model.getCheckDate().getTime())); ps.setString(9, hospitalsMap.get(model.getHospitalId())); @@ -256,7 +256,7 @@ public class RcGlxtService { } ps.setString(5, diagnosis); - ps.setString(6, model.getTreatOpinion()); + ps.setString(6, model.getDirOpinion()); ps.setString(7, StringUtils.isNum(model.getProdDoctor()) ? CommonsHelper.getUserName(model.getProdDoctor(), usersService) : model.getProdDoctor()); ps.setTimestamp(8, new Timestamp(model.getCheckTime().getTime())); ps.setString(9, hospitalsMap.get(model.getHospitalId())); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index a114803..3a10405 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -2621,7 +2621,7 @@ public class TestController extends BaseController { AntExChuQuery antExChuQuery = new AntExChuQuery(); antExChuQuery.setYn(YnEnums.YES.getId()); antExChuQuery.setHospitalList(rcGlxtService.getHids()); - antExChuQuery.setCreatedTimeStart(DateUtil.addMonth(new Date(), -50)); + antExChuQuery.setCreatedTimeStart(DateUtil.addMonth(new Date(), -5)); antExChuQuery.setCreatedTimeEnd(new Date()); List antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery); if (CollectionUtils.isNotEmpty(antExChuModels)) @@ -2644,7 +2644,7 @@ public class TestController extends BaseController { AntExChuQuery antExChuQuery = new AntExChuQuery(); antExChuQuery.setYn(YnEnums.YES.getId()); antExChuQuery.setHospitalList(rcGlxtService.getHids()); - antExChuQuery.setCreatedTimeStart(DateUtil.addMonth(new Date(), -50)); + antExChuQuery.setCreatedTimeStart(DateUtil.addMonth(new Date(), -5)); antExChuQuery.setCreatedTimeEnd(new Date()); List antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery); if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(antExChuModels)) { @@ -2657,7 +2657,7 @@ public class TestController extends BaseController { AntExQuery antExQuery = new AntExQuery(); antExQuery.setYn(YnEnums.YES.getId()); antExQuery.setHospitalIds(rcGlxtService.getHids()); - antExQuery.setModifiedStart(DateUtil.addMonth(new Date(), -50)); + antExQuery.setModifiedStart(DateUtil.addMonth(new Date(), -5)); antExQuery.setModifiedEnd(new Date()); List antEx = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(antEx)) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 000c012..de4b404 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -2566,7 +2566,12 @@ public class ViewFacade { map.put("address", CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService)); - //父亲姓名 + + //户籍地址 + String addressRegister = CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), + patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService); + map.put("maddressRegister",addressRegister); + //父亲姓名 map.put("hname",patients.getHusbandName()); //父亲国籍 map.put("fatherCountry", getBasicConfig(patients.getHcountryId())); @@ -2577,6 +2582,11 @@ public class ViewFacade { //父亲证件号码 map.put("fcardnum", StringUtils.isNotEmpty(patients.getHcertificateNum()) ? patients.getHcertificateNum() : ""); + + String haddressRegister = CommonsHelper.getResidence(patients.getHprovinceRegisterId(), patients.getHcityRegisterId(), + patients.getHareaRegisterId(), patients.getHstreetRegisterId(), patients.getHaddressRegister(), basicConfigService); + map.put("haddressRegister",haddressRegister); + //高危因素 // HighScoreResult highScoreResult = null; // if (CollectionUtils.isNotEmpty(patients.getRiskFactorId())) {