From 89bcaf49d7e28e5bda7f151f3a061c104d15c10f Mon Sep 17 00:00:00 2001 From: wtt Date: Sun, 9 Jun 2019 23:15:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BB=BA=E6=A1=A3=E5=8E=86=E5=8F=B2=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=88=9D=E5=A7=8B=E5=8C=962.0=E5=88=B03.0=E7=BA=BF?= =?UTF-8?q?=E7=A8=8B=E6=B1=A0=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/PregnantBuildController.java | 13 ++++++- .../operate/web/facade/BookbuildingFacade.java | 43 +++++++++++++--------- 2 files changed, 38 insertions(+), 18 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java index 1030560..987fa19 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java @@ -125,7 +125,18 @@ public class PregnantBuildController extends BaseController{ @RequestMapping(method = RequestMethod.POST, value = "/v2/saveOrUpdate") @ResponseBody public BaseResponse saveOrUpdateByV2(@RequestBody SyncV2YunBookbuildingRequest param) { - System.out.println(param.toString()); + param.setBookbuildingDoctor("1000000185");//todo + param.setLastMenstrualPeriod(null);//todo + param.setHospitalId("216");//todo + +// //1、使用JSONObject +// JSONObject json = JSONObject.fromObject(param); +// System.out.println(json); +// String str = "{\"birthday\":\"1999/10/2 0:00:00\",\"bookbuildingDate\":\"2019/6/9 22:44:28\",\"bookbuildingDoctor\":\"1000000185\",\"childExtAddrs\":[],\"childbirthAddr\":\"的规范高大上\",\"childbirthAreaId\":\"169\",\"childbirthCityId\":\"12\",\"childbirthProvinceId\":\"1\",\"childbirthStreetId\":\"2652\",\"couponCode\":\"\",\"couponType\":0,\"delFiles\":[],\"dueDate\":\"\",\"dueStatus\":0,\"expType\":0,\"expVip\":0,\"fileCode\":\"\",\"filePath\":null,\"fillDate\":\"\",\"fuckLastMens\":\"\",\"hdelFiles\":[],\"hospitalId\":\"216\",\"husbandAddressRegister\":\"\",\"husbandAreaRegisterId\":\"\",\"husbandBirth\":\"0001/1/1 0:00:00\",\"husbandCertificateNum\":\"\",\"husbandCertificateTypeId\":\"\",\"husbandCityRegisterId\":\"\",\"husbandCountryId\":\"\",\"husbandLevelTypeId\":\"\",\"husbandName\":\"\",\"husbandNationId\":\"\",\"husbandPhone\":\"\",\"husbandProfessionTypeId\":\"\",\"husbandProvinceRegisterId\":\"\",\"husbandStreetRegisterId\":\"\",\"husbandWorkUnit\":\"\",\"id\":\"\",\"lastMenstrualPeriod\":\"\",\"lastMenstrualPeriodBasis\":\"\",\"lastMenstrualPeriodBasisDate\":\"\",\"lastMenstrualPeriodBasisDoctorId\":\"\",\"lastMenstrualPeriodBasisDoctorName\":\"\",\"lastMenstrualPeriodBasisId\":\"\",\"lastMenstrualPeriodBasisOther\":\"\",\"mensEndDay\":\"\",\"mensStartDay\":\"\",\"mensStopEndDay\":\"\",\"mensStopStartDay\":\"\",\"mremark\":\"\",\"patientSerResults\":[],\"patientdId\":\"\",\"pid\":\"\",\"pregnantCensusAddr\":\"大范甘迪发\",\"pregnantCensusAreaId\":\"169\",\"pregnantCensusCityId\":\"12\",\"pregnantCensusProvinceId\":\"1\",\"pregnantCensusStreetId\":\"2652\",\"pregnantCensusTypeId\":\"非农业户口\",\"pregnantCertificateNum\":\"370784199910027828\",\"pregnantCertificateTypeId\":\"70ae1d93-2964-46bc-83fa-bec9ff605b1c\",\"pregnantCountryId\":\"0da4334f-49e7-4180-b690-5cea668f75e9\",\"pregnantLevelTypeId\":\"\",\"pregnantLiveAddr\":\"第三方十多个\",\"pregnantLiveAreaId\":\"169\",\"pregnantLiveCityId\":\"12\",\"pregnantLiveProvinceId\":\"1\",\"pregnantLiveStreetId\":\"2652\",\"pregnantLiveTypeId\":\"非本地居住一年以下\",\"pregnantName\":\"递四方速递\",\"pregnantNationId\":\"6bfbc869-f27b-4180-8fa6-c0a9b8e4b8df\",\"pregnantPhone\":\"15810205989\",\"pregnantProfessionTypeId\":\"6c685690-2dc7-403b-bf99-f1fd5359c114\",\"pregnantWorkUnit\":\"的观点\",\"reqHusband\":false,\"reqHusbandInt\":2,\"sendCareMan\":\"\",\"sendCoupon\":false,\"serInfos\":[],\"serviceStatus\":0,\"serviceType\":0,\"townOrgId\":\"\",\"userId\":0,\"vcCardNo\":\"5165165\",\"vipEndTime\":\"\"}\n"; +// //1、使用JSONObject +// JSONObject jsonObject=JSONObject.fromObject(str); +// SyncV2YunBookbuildingRequest stu=(SyncV2YunBookbuildingRequest)JSONObject.toBean(jsonObject, SyncV2YunBookbuildingRequest.class); + if (param != null && !StringUtils.isEmpty(param.getId()) ) { return bookbuildingFacade.updatePregnantByIdV2(param.getId(), param, param.getUserId(), false); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index f0b7072..e1dbaa3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -217,21 +217,26 @@ public class BookbuildingFacade { patientsQuery.setCardNo(yunRequest.getPregnantCertificateNum()); //判断该身份证号码是否有孕妇建档 在该医院 List patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); - if (CollectionUtils.isNotEmpty(patients) && patients.get(0).getLastMenses().getTime() < DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()).getTime()) { - br.setErrorcode(ErrorCodeConstants.DATA_EXIST); - br.setErrormsg("该身份证在医院已经建档"); - return br; + if(yunRequest.getLastMenstrualPeriod() != null && !yunRequest.getLastMenstrualPeriod().equals("")){//todowtt + if (CollectionUtils.isNotEmpty(patients) && patients.get(0).getLastMenses().getTime() < DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()).getTime()) { + br.setErrorcode(ErrorCodeConstants.DATA_EXIST); + br.setErrormsg("该身份证在医院已经建档"); + return br; + } } + } if (yunRequest.getPregnantPhone() != null) { patientsQuery.setCardNo(null); patientsQuery.setPhone(yunRequest.getPregnantPhone()); //判断该手机号码在 孕期内有没有建档 List patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); - if (CollectionUtils.isNotEmpty(patients) && patients.get(0).getLastMenses().getTime() < DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()).getTime()) { - br.setErrorcode(ErrorCodeConstants.DATA_EXIST); - br.setErrormsg("该手机号码已经建档"); - return br; + if(yunRequest.getLastMenstrualPeriod() != null && !yunRequest.getLastMenstrualPeriod().equals("")){//todowtt + if (CollectionUtils.isNotEmpty(patients) && patients.get(0).getLastMenses().getTime() < DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()).getTime()) { + br.setErrorcode(ErrorCodeConstants.DATA_EXIST); + br.setErrormsg("该手机号码已经建档"); + return br; + } } } @@ -242,10 +247,12 @@ public class BookbuildingFacade { patientsQuery.setVcCardNo(yunRequest.getVcCardNo()); patientsQuery.setHospitalId(yunRequest.getHospitalId()); List patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); - if (CollectionUtils.isNotEmpty(patients) && patients.get(0).getLastMenses().getTime() < DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()).getTime()) { - br.setErrorcode(ErrorCodeConstants.DATA_EXIST); - br.setErrormsg("该就诊卡号在该医院已经建档"); - return br; + if(yunRequest.getLastMenstrualPeriod() != null && !yunRequest.getLastMenstrualPeriod().equals("")) {//todowtt + if (CollectionUtils.isNotEmpty(patients) && patients.get(0).getLastMenses().getTime() < DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()).getTime()) { + br.setErrorcode(ErrorCodeConstants.DATA_EXIST); + br.setErrormsg("该就诊卡号在该医院已经建档"); + return br; + } } } @@ -253,7 +260,7 @@ public class BookbuildingFacade { //建档类型 0 未分娩建档 1儿童建档时建档 2 自动分娩类型 3 转诊自动建档 Integer buildType = 0; Date date = null; - if (yunRequest.getLastMenstrualPeriod() != null) { + if (yunRequest.getLastMenstrualPeriod() != null && !yunRequest.getLastMenstrualPeriod().equals("") ) { date = DateUtil.addWeek(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()), 42); Date currentDate = DateUtil.formatDate(new Date()); if (date.getTime() <= currentDate.getTime()) { @@ -297,8 +304,9 @@ public class BookbuildingFacade { if ("2100001291".equals(patient.getHospitalId()) && StringUtils.isNotEmpty(yunRequest.getVcCardNo())) { patient.setBlNum(cdfyHisService.getIdByVcCardNo(yunRequest.getVcCardNo())); } - - patient.setBuildDays(DateUtil.getDays(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()), new Date())); + if (yunRequest.getLastMenstrualPeriod() != null && !yunRequest.getLastMenstrualPeriod().equals("") ){ + patient.setBuildDays(DateUtil.getDays(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()), new Date())); + } patient.setDueStatus(0); //1孕妇 3 产妇 @@ -733,9 +741,10 @@ public class BookbuildingFacade { JSONObject jsonObject = getQueryParam(patients); // String result = restTemplate.postForObject(syncToV2Url + "/v3/bookbuilding/savaOrUpdate", jsonObject, String.class); // logger.info("建档数据同步到2.0系统,返回结果: {}", result); - Map map = new HashMap<>(); + Map map = new HashMap<>(); map.put("jsonObject", jsonObject); ResponseEntity responseEntity = restTemplate.getForEntity(syncToV2Url +"/GetPatient.asmx/GetPatientInfo?data={jsonObject}", String.class, map); + System.out.println(responseEntity); } }); syncThread.start(); @@ -790,6 +799,7 @@ public class BookbuildingFacade { jsonObject.put("P_HUSBANDCARDNO", patients.getHusbandBirth());//丈夫证件号码 jsonObject.put("P_HUSBANDBIRTHDAY", sdf.format(patients.getHusbandBirth()));//丈夫出生日期 jsonObject.put("P_HUSBANDEDUCATIONLEVEL",""); + jsonObject.put("P_HOSPITALID", "");//todo建党机构 jsonObject.put("P_HUSBANDOCCUPATIONID",""); jsonObject.put("P_HUSBANDRRTOWNSHIP",""); jsonObject.put("P_HUSBANDRRVILLAGE",""); @@ -807,7 +817,6 @@ public class BookbuildingFacade { jsonObject.put("P_CLINICNO", patients.getVcCardNo());//条码号 jsonObject.put("P_DOCID", "建档人");//todo建档人 //让写死桃城区,董勤说最后定 - jsonObject.put("P_HOSPITALID", "52c15438-455f-4838-ae79-b18a2315a96e");//todo建党机构 jsonObject.put("P_FILINGTIME", sdf.format(patients.getBookbuildingDate()));//建档时间 if (patients.getReqHusband() != null) {//丈夫信息是否必须 -- 1.8.3.1