smartor.git - Gitblit

			@@ -994,9 +994,7 @@
			@PostMapping("/syncMedOperForShiyi")
			public AjaxResult syncMedOperForShiyi(@RequestParam("startTime") String startTime, @RequestParam("endTime") String endTime) {
			// 立即返回，后台异步执行
			CompletableFuture.runAsync(() -> {
			collectHISService.syncOper(startTime, endTime);
			});
			collectHISService.syncOper(startTime, endTime);
			return AjaxResult.success("同步任务已启动，请稍后查看结果");
			}

			@@ -454,8 +454,14 @@
			if(StringUtils.isNotEmpty(operation.getOpid())){
			PatMedOperationItem patMedOperationItem = new PatMedOperationItem();
			//patMedOperation.opReqid = patMedOperationItem.operationid
			patMedOperationItem.setOperationid(operation.getOpreqid());
			List<PatMedOperationItem> patMedOperationItems = chMapper.selectOperItemList(patMedOperationItem);
			List<PatMedOperationItem> patMedOperationItems = new ArrayList<>();
			if (ObjectUtils.isNotEmpty(operation.getOpreqid())){
			patMedOperationItem.setOperationid(operation.getOpreqid());
			patMedOperationItems = chMapper.selectOperItemList(patMedOperationItem);
			}else {
			log.info("同步手术详情信息:手术申请单ID为空!");
			return count;
			}

			PatMedOperationItem operItem = new PatMedOperationItem();
			operItem.setOperationid(operation.getOpreqid());

			@@ -899,6 +899,9 @@
			<if test="orgid != null and orgid != ''">
			AND o.orgid = #{orgid}
			</if>
			<if test="opreqid != null and opreqid != ''">
			AND o.opreqid = #{opreqid}
			</if>
			<if test="lastStartTime != null and lastStartTime != ''">
			and to_char(o.last_Update_Time, 'YYYY-MM-DD HH24:MI:SS') >= #{lastStartTime}
			</if>
			@@ -941,6 +944,9 @@
			<if test="opid != null and opid != ''">
			AND oi.opid = #{opid}
			</if>
			<if test="operationid != null and operationid != ''">
			AND oi.operationid = #{operationid}
			</if>
			<if test="lastStartTime != null and lastStartTime != ''">
			and oi.last_Update_Time >= to_date(#{lastStartTime}, 'YYYY-MM-DD HH24:MI:SS')
			</if>

	ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史