ltkj_peis.git - gitblit

			@@ -318,6 +318,7 @@
			@GetMapping("/dataSynchronization")
			@ApiOperation(value = "同步sql server数据到本地数据库数据接口")
			@RepeatSubmit
			@Transactional
			public AjaxResult dataSynchronization(@RequestParam String tjNumber) {
			//根据配置调取存储过程将临时表数据存入预约表2023.12.12
			final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
			@@ -356,13 +357,21 @@

			List<String> baoGaoDans = ltkjHybgdService.getJianYanBaoGaoDan(order.getCardId());
			if(null !=baoGaoDans && baoGaoDans.size()>0){

			// List<LtkjHysqd> one = testMapper.getHysqdByTmh(order.getCardId());
			// if (one != null && one.size() > 0) {
			// for (LtkjHysqd ltkjHysqd : one) {
			// ltkjHysqdService.deletedLtkjHysqdByTjhAndTmh(ltkjHysqd.getTjh(), ltkjHysqd.getTmh());
			// ltkjHybgdService.deletedLtkjHybgdByTjhAndTmh(ltkjHysqd.getTmh());
			// }
			// }
			// for (String baoGaoDan : baoGaoDans) {
			Date dates = new Date();
			Map<String,Object> map=new HashMap<>();
			map.put("his_registration_id",order.getCardId());
			map.put("ksbm","");
			map.put("pationid","");
			map.put("ksrq",DateUtil.format(DateUtil.beginOfDay(dates), "yyyy-MM-dd HH:mm:ss"));
			map.put("ksrq",DateUtil.format(DateUtil.beginOfDay(order.getCreateTime()), "yyyy-MM-dd HH:mm:ss"));
			map.put("jsrq",DateUtil.format(DateUtil.endOfDay(dates), "yyyy-MM-dd HH:mm:ss"));
			map.put("pagecount",10);
			map.put("page",1);
			@@ -378,7 +387,8 @@
			JSONObject jsonObject = (JSONObject)datum;
			LtkjHysqd jybgid = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(order.getCardId(), jsonObject.getStr("JYBGID"));
			if(null !=jybgid){
			continue;
			ltkjHysqdService.deletedLtkjHysqdByTjhAndTmh(order.getCardId(),jsonObject.getStr("JYBGID"));
			ltkjHybgdService.deletedLtkjHybgdByTjhAndTmh(jybgid.getTmh());
			}
			LtkjHysqd hysqd=new LtkjHysqd();
			hysqd.setTjh(order.getCardId());
			@@ -693,19 +703,29 @@
			if (null != tjOrderDetails && tjOrderDetails.size() > 0) {
			for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
			final TjProject byId = projectService.selectTjProjectByProId(tjOrderDetail.getProId());
			String metering = null;
			if (null == byId) {
			detailService.removeById(tjOrderDetail.getOrderDetailId());
			} else {
			metering = byId.getProMetering();
			tjOrderDetail.setProject(byId);
			}
			List<TjStandard> list2 = tjStandardService.getTjStandardListByProId(String.valueOf(tjOrderDetail.getProId()));
			if (list2.size() == 0) {
			tjOrderDetail.setStandard(new TjStandard());
			TjStandard standard = new TjStandard();
			if (StrUtil.isNotBlank(metering))
			standard.setCompany(metering);
			tjOrderDetail.setStandard(standard);
			} else if (list2.size() == 1) {
			tjOrderDetail.setStandard(list2.get(0));
			TjStandard standard = list2.get(0);
			if (StrUtil.isNotBlank(metering) && StrUtil.isBlank(standard.getCompany()))
			standard.setCompany(metering);
			tjOrderDetail.setStandard(standard);
			} else {
			final int ageType = StringUtils.getAgeType(DateUtil.ageOfNow(customer.getCusBrithday()));
			TjStandard tjStandard1 = tjStandardService.getListBySexAndType(customer.getCusSex(), ageType, String.valueOf(tjOrderDetail.getProId()));
			if (StrUtil.isNotBlank(metering) && StrUtil.isBlank(tjStandard1.getCompany()))
			tjStandard1.setCompany(metering);
			tjOrderDetail.setStandard(tjStandard1);
			}
			}
			@@ -774,6 +794,9 @@
			for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
			if(remark.getProId().equals(tjOrderDetail.getProId())){
			String ckfw = tjOrderDetail.getStanId();
			if (StrUtil.isNotBlank(tjOrderDetail.getProAdvice())){
			ckfw = ckfw.replace(tjOrderDetail.getProAdvice().trim(),"");
			}
			if (StrUtil.isNotBlank(ckfw)) {
			try {
			Integer.parseInt(tjOrderDetail.getYcbz());
			@@ -789,7 +812,9 @@
			}else {
			tjOrderDetail.setYcbz("");
			}
			} catch (NumberFormatException ignored) { }
			} catch (NumberFormatException ignored) {
			ignored.printStackTrace();
			}
			}
			if(null !=tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().equals("")){
			tjOrderDetail.setProResult(tjOrderDetail.getProResult()+" ["+tjOrderDetail.getYcbz()+"]");