jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 89bcaf49d7e28e5bda7f151f3a061c104d15c10f

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

建档历史数据初始化2.0到3.0线程池方式

Showing 2 changed files with 38 additions and 18 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java View file @ 89bcaf4
... ... @@ -125,7 +125,18 @@
125 125 @RequestMapping(method = RequestMethod.POST, value = "/v2/saveOrUpdate")
126 126 @ResponseBody
127 127 public BaseResponse saveOrUpdateByV2(@RequestBody SyncV2YunBookbuildingRequest param) {
128   - System.out.println(param.toString());
  128 + param.setBookbuildingDoctor("1000000185");//todo
  129 + param.setLastMenstrualPeriod(null);//todo
  130 + param.setHospitalId("216");//todo
  131 +
  132 +// //1、使用JSONObject
  133 +// JSONObject json = JSONObject.fromObject(param);
  134 +// System.out.println(json);
  135 +// 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";
  136 +// //1、使用JSONObject
  137 +// JSONObject jsonObject=JSONObject.fromObject(str);
  138 +// SyncV2YunBookbuildingRequest stu=(SyncV2YunBookbuildingRequest)JSONObject.toBean(jsonObject, SyncV2YunBookbuildingRequest.class);
  139 +
129 140  
130 141 if (param != null && !StringUtils.isEmpty(param.getId()) ) {
131 142 return bookbuildingFacade.updatePregnantByIdV2(param.getId(), param, param.getUserId(), false);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ 89bcaf4
... ... @@ -217,21 +217,26 @@
217 217 patientsQuery.setCardNo(yunRequest.getPregnantCertificateNum());
218 218 //判断该身份证号码是否有孕妇建档 在该医院
219 219 List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
220   - if (CollectionUtils.isNotEmpty(patients) && patients.get(0).getLastMenses().getTime() < DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()).getTime()) {
221   - br.setErrorcode(ErrorCodeConstants.DATA_EXIST);
222   - br.setErrormsg("该身份证在医院已经建档");
223   - return br;
  220 + if(yunRequest.getLastMenstrualPeriod() != null && !yunRequest.getLastMenstrualPeriod().equals("")){//todowtt
  221 + if (CollectionUtils.isNotEmpty(patients) && patients.get(0).getLastMenses().getTime() < DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()).getTime()) {
  222 + br.setErrorcode(ErrorCodeConstants.DATA_EXIST);
  223 + br.setErrormsg("该身份证在医院已经建档");
  224 + return br;
  225 + }
224 226 }
  227 +
225 228 }
226 229 if (yunRequest.getPregnantPhone() != null) {
227 230 patientsQuery.setCardNo(null);
228 231 patientsQuery.setPhone(yunRequest.getPregnantPhone());
229 232 //判断该手机号码在 孕期内有没有建档
230 233 List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
231   - if (CollectionUtils.isNotEmpty(patients) && patients.get(0).getLastMenses().getTime() < DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()).getTime()) {
232   - br.setErrorcode(ErrorCodeConstants.DATA_EXIST);
233   - br.setErrormsg("该手机号码已经建档");
234   - return br;
  234 + if(yunRequest.getLastMenstrualPeriod() != null && !yunRequest.getLastMenstrualPeriod().equals("")){//todowtt
  235 + if (CollectionUtils.isNotEmpty(patients) && patients.get(0).getLastMenses().getTime() < DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()).getTime()) {
  236 + br.setErrorcode(ErrorCodeConstants.DATA_EXIST);
  237 + br.setErrormsg("该手机号码已经建档");
  238 + return br;
  239 + }
235 240 }
236 241 }
237 242  
... ... @@ -242,10 +247,12 @@
242 247 patientsQuery.setVcCardNo(yunRequest.getVcCardNo());
243 248 patientsQuery.setHospitalId(yunRequest.getHospitalId());
244 249 List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
245   - if (CollectionUtils.isNotEmpty(patients) && patients.get(0).getLastMenses().getTime() < DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()).getTime()) {
246   - br.setErrorcode(ErrorCodeConstants.DATA_EXIST);
247   - br.setErrormsg("该就诊卡号在该医院已经建档");
248   - return br;
  250 + if(yunRequest.getLastMenstrualPeriod() != null && !yunRequest.getLastMenstrualPeriod().equals("")) {//todowtt
  251 + if (CollectionUtils.isNotEmpty(patients) && patients.get(0).getLastMenses().getTime() < DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()).getTime()) {
  252 + br.setErrorcode(ErrorCodeConstants.DATA_EXIST);
  253 + br.setErrormsg("该就诊卡号在该医院已经建档");
  254 + return br;
  255 + }
249 256 }
250 257 }
251 258  
... ... @@ -253,7 +260,7 @@
253 260 //建档类型 0 未分娩建档 1儿童建档时建档 2 自动分娩类型 3 转诊自动建档
254 261 Integer buildType = 0;
255 262 Date date = null;
256   - if (yunRequest.getLastMenstrualPeriod() != null) {
  263 + if (yunRequest.getLastMenstrualPeriod() != null && !yunRequest.getLastMenstrualPeriod().equals("") ) {
257 264 date = DateUtil.addWeek(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()), 42);
258 265 Date currentDate = DateUtil.formatDate(new Date());
259 266 if (date.getTime() <= currentDate.getTime()) {
260 267  
... ... @@ -297,9 +304,10 @@
297 304 if ("2100001291".equals(patient.getHospitalId()) && StringUtils.isNotEmpty(yunRequest.getVcCardNo())) {
298 305 patient.setBlNum(cdfyHisService.getIdByVcCardNo(yunRequest.getVcCardNo()));
299 306 }
  307 + if (yunRequest.getLastMenstrualPeriod() != null && !yunRequest.getLastMenstrualPeriod().equals("") ){
  308 + patient.setBuildDays(DateUtil.getDays(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()), new Date()));
  309 + }
300 310  
301   - patient.setBuildDays(DateUtil.getDays(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()), new Date()));
302   -
303 311 patient.setDueStatus(0);
304 312 //1孕妇 3 产妇
305 313 patient.setType(type);
306 314  
... ... @@ -733,9 +741,10 @@
733 741 JSONObject jsonObject = getQueryParam(patients);
734 742 // String result = restTemplate.postForObject(syncToV2Url + "/v3/bookbuilding/savaOrUpdate", jsonObject, String.class);
735 743 // logger.info("建档数据同步到2.0系统，返回结果： {}", result);
736   - Map<String, JSONObject> map = new HashMap<>();
  744 + Map<String, Object> map = new HashMap<>();
737 745 map.put("jsonObject", jsonObject);
738 746 ResponseEntity<String> responseEntity = restTemplate.getForEntity(syncToV2Url +"/GetPatient.asmx/GetPatientInfo?data={jsonObject}", String.class, map);
  747 + System.out.println(responseEntity);
739 748 }
740 749 });
741 750 syncThread.start();
... ... @@ -790,6 +799,7 @@
790 799 jsonObject.put("P_HUSBANDCARDNO", patients.getHusbandBirth());//丈夫证件号码
791 800 jsonObject.put("P_HUSBANDBIRTHDAY", sdf.format(patients.getHusbandBirth()));//丈夫出生日期
792 801 jsonObject.put("P_HUSBANDEDUCATIONLEVEL","");
  802 + jsonObject.put("P_HOSPITALID", "");//todo建党机构
793 803 jsonObject.put("P_HUSBANDOCCUPATIONID","");
794 804 jsonObject.put("P_HUSBANDRRTOWNSHIP","");
795 805 jsonObject.put("P_HUSBANDRRVILLAGE","");
... ... @@ -807,7 +817,6 @@
807 817 jsonObject.put("P_CLINICNO", patients.getVcCardNo());//条码号
808 818 jsonObject.put("P_DOCID", "建档人");//todo建档人
809 819 //让写死桃城区，董勤说最后定
810   - jsonObject.put("P_HOSPITALID", "52c15438-455f-4838-ae79-b18a2315a96e");//todo建党机构
811 820 jsonObject.put("P_FILINGTIME", sdf.format(patients.getBookbuildingDate()));//建档时间
812 821  
813 822 if (patients.getReqHusband() != null) {//丈夫信息是否必须