ltkj_peis.git - gitblit

			@@ -158,7 +158,6 @@
			}



			// @GetMapping ("/ceshi")
			// @ApiOperation (value = "测试调用lis视图数据接口")
			// @RepeatSubmit
			@@ -185,8 +184,6 @@
			//
			// return AjaxResult.success(ccXZxYyPacsJgSt);
			// }




			@GetMapping ("/getOperationPermissionsByTjNum")
			@@ -672,8 +669,7 @@
			}
			}
			return AjaxResult.success("同步成功");
			}
			else if(null !=sfkqdshitulianjie && sfkqdshitulianjie.equalsIgnoreCase("Y")){
			} else if (null != sfkqdshitulianjie && sfkqdshitulianjie.equalsIgnoreCase("Y")) {
			List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(order.getTjNumber(),dqyyyqbm);
			if(null != hysqdList && !hysqdList.isEmpty()){
			for (LtkjHysqd hysqd : hysqdList) {
			@@ -724,7 +720,6 @@
			}



			/**
			* 同步sql server数据到本地数据库数据接口
			*/
			@@ -740,7 +735,6 @@
			String doctorId = configService.selectConfigByKey("request_default_check_doctorId");
			//根据配置调取存储过程将临时表数据存入预约表2023.12.12
			final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
			String dqyyyqbm = configService.selectConfigByKey("dqyyyqbm");
			final String sfkqdyhis = configService.selectConfigByKey("sfkqdyhis");
			TjOrder order = orderService.getOrderByTjNum(tjNumber);
			if (null != order) {
			@@ -748,16 +742,9 @@
			//开启字典弹窗
			if ("Y".equals(getInfoFromSqlData)) {
			tbhyxm(order);
			//同步化验项目
			// testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
			//同步检查项目
			// testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
			asyncService.updateCheckType(order.getTjNumber());

			}
			// 11:42:04.617 [http-nio-5000-exec-72] ERROR c.a.d.p.DruidDataSource - [init,905] - init datasource error, url: jdbc:sqlserver://192.168.10.2:1433;DatabaseName=hospital;&characterEncoding=utf8
			//com.microsoft.sqlserver.jdbc.SQLServerException: 驱动程序无法通过使用安全套接字层(SSL)加密与 SQL Server 建立安全连接。错误:“No appropriate protocol (protocol is disabled or cipher suites are inappropriate)”。
			//
			//开启和his对接
			if (null != sfkqdyhis && sfkqdyhis.equals("Y")) {
			List<String> baoGaoDans = ltkjHybgdService.getJianYanBaoGaoDan(order.getCardId());
			@@ -778,9 +765,6 @@
			String result1 = getAjaxResult(result);
			JSONObject object = getJSONObject(result1);
			String code = object.getStr("ResultCode");
			// if (null == code \|\| !code.equals("0")) {
			// return AjaxResult.error("化验项目暂时未出结果,请稍后同步!!!");
			// }
			if(null != code && code.equals("0")) {
			JSONArray data = object.getJSONArray("ResultData");
			for (Object datum : data) {
			@@ -887,32 +871,8 @@

			}
			jcsqdService.saveLtkjExamJcsqd(order.getCardId());
			/* List<LtkjExamJcsqd> jcsqdList = jcsqdService.getLtkjJcsqdByTjh(order.getCardId());
			if(null !=jcsqdList && !jcsqdList.isEmpty()) {
			for (LtkjExamJcsqd jcsqd : jcsqdList) {
			if (StringUtil.isNotBlank(jcsqd.getJgzt())) {
			String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("。\|；\|;");
			for (String jg : split) {
			if (StringUtil.isNotBlank(jg) && !jg.contains("未见异常")
			&& !jg.contains("未见明显异常") && !jg.contains("未见占位") && !jg.contains("未见")
			&& !jg.contains("未见明显") && !jg.contains("正常") && !jg.contains("双侧椎间孔无狭窄")) {
			TjJcycxm jcycxm = new TjJcycxm();
			jcycxm.setTjh(order.getTjNumber());
			jcycxm.setYqid(dqyyyqbm);
			String[] split1 = jcsqd.getJcxmid().split(";");
			jcycxm.setProId(split1[0]);
			jcycxm.setProName(jcsqd.getJcxmmc());
			jcycxm.setCreateTime(new Date());
			jcycxm.setJcjg(jg);
			jcycxmService.save(jcycxm);
			}
			}
			}
			}
			}*/
			testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
			}else {
			// return AjaxResult.error("检查项目暂时未出结果,请稍后同步!!!");
			resultMsg+="\n检查项目暂时未出结果,请稍后同步!!!";
			}
			}
			@@ -929,10 +889,6 @@
			return AjaxResult.success("同步成功");
			else return AjaxResult.error(resultMsg);
			}
			//化验
			// testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
			//检查
			// jcsqdService.saveLtkjExamJcsqd(order.getCardId());
			return AjaxResult.success("同步成功");
			}
			return AjaxResult.error("未查到该人员体检记录");
			@@ -1170,7 +1126,6 @@
			}



			@GetMapping ("/getBghsList")
			@ApiOperation (value = "报告核收页面查询接口")//0待1已
			// @PreAuthorize("@ss.hasPermi('check:check:getList')")
			@@ -1279,7 +1234,6 @@
			if (endTime == null) endTime = "";
			return AjaxResult.success(orderService.getgetBghsList(tjNumber, page, pageSize, value, beginTime, endTime, name));
			}



			/**
			@@ -1600,9 +1554,11 @@
			tjOrderDetail.setYcbz("");
			}
			}else {
			if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("阴")) tjOrderDetail.setYcbz("");
			if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("阴"))
			tjOrderDetail.setYcbz("");

			if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("阳")) tjOrderDetail.setYcbz("↑");
			if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("阳"))
			tjOrderDetail.setYcbz("↑");
			}
			} catch (NumberFormatException ignored) {
			}
			@@ -1716,7 +1672,6 @@
			}



			@GetMapping ("/getzongjianyishengchakanyichangxiangmu")
			@ApiOperation (value = "总检查看异常项目接口")
			public AjaxResult getzongjianyishengchakanyichangxiangmu(@RequestParam String tjNum) {
			@@ -1783,19 +1738,17 @@
			List<Map<String, Object>> collect1 = maps.stream()
			.sorted((map1, map2) -> map2.get("proName").toString().compareTo(map1.get("proName").toString()))
			.collect(Collectors.toList());
			System.out.println("总耗时:"+(System.currentTimeMillis()-l));
			System.out.println("总检查看异常项目接口总耗时:" + (System.currentTimeMillis() - l));
			return AjaxResult.success(collect1);
			}
			System.out.println("总耗时:"+(System.currentTimeMillis()-l));
			System.out.println("总检查看异常项目接口总耗时:" + (System.currentTimeMillis() - l));

			return AjaxResult.success(maps);
			}else {
			List<Map<String, Object>> mapList = zongjianyishengchakanyichangxiangmu(tjNum);
			System.out.println("总耗时:"+(System.currentTimeMillis()-l));
			System.out.println("总检查看异常项目接口总耗时:" + (System.currentTimeMillis() - l));
			return AjaxResult.success(mapList);
			}

			// return zongjianyishengchakanyichangxiangmu(tjNum);
			}
			return AjaxResult.error();
			}
			@@ -1961,8 +1914,6 @@
			}




			/**
			* 同步sql server数据到本地数据库数据接口
			*/
			@@ -1989,8 +1940,6 @@
			return AjaxResult.error("该人员数据正在同步中，请稍等");
			}
			}




			}