From 62dbd8169d8cad03e7a06f9b53b0a1928caf732f Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 06 三月 2025 18:13:45 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java | 96 ++++++++++++++----------------------------------
1 files changed, 28 insertions(+), 68 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java
index 4fba862..ff10844 100644
--- a/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java
@@ -6,6 +6,9 @@
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.Gson;
+import com.ruoyi.common.enums.HospTypeEnum;
+import com.ruoyi.common.enums.ServiceTaskTypeEnum;
+import com.ruoyi.common.enums.TaskTypeEnum;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.*;
import com.ruoyi.common.utils.http.HttpEntity;
@@ -16,6 +19,7 @@
import com.smartor.mapper.ServiceSubtaskMapper;
import com.smartor.service.IServiceTaskService;
import com.smartor.service.ISvyTaskSingleService;
+import com.sun.org.apache.bcel.internal.generic.NEW;
import lombok.extern.slf4j.Slf4j;
import okhttp3.OkHttpClient;
import okhttp3.Request;
@@ -168,7 +172,7 @@
patTaskRelevance.setSfzh(serviceSubtask1.getSfzh());
patTaskRelevance.setPhone(serviceSubtask1.getPhone());
patTaskRelevance.setAddr(serviceSubtask1.getAddr());
- patTaskRelevance.setDiagname(serviceSubtask1.getDiagname());
+ patTaskRelevance.setDiagname(serviceSubtask1.getLeavediagname());
patTaskRelevance.setPatid(serviceSubtask1.getPatid());
patTaskRelevance.setSendStatus(serviceSubtask1.getSendstate());
patTaskRelevances.add(patTaskRelevance);
@@ -182,7 +186,7 @@
patTaskRelevance.setAddr(serviceSubtask1.getAddr());
patTaskRelevance.setDeptName(serviceSubtask1.getDeptname());
patTaskRelevance.setBedNo(serviceSubtask1.getBedNo());
- patTaskRelevance.setDiagname(serviceSubtask1.getDiagname());
+ patTaskRelevance.setDiagname(serviceSubtask1.getLeavediagname());
patTaskRelevance.setPatid(serviceSubtask1.getPatid());
patTaskRelevance.setSendStatus(serviceSubtask1.getSendstate());
patTaskRelevances.add(patTaskRelevance);
@@ -201,69 +205,27 @@
else if (isoperation == 3) serviceSubtaskMapper.deleteServiceSubtaskByCondition(taskId, patid);
}
-
@Override
public int insertTaskInfo(ServiceTaskInfo serviceTaskVO) {
if (ObjectUtils.isEmpty(serviceTaskVO)) {
log.info("鏂板浠诲姟鍏ュ弬涓虹┖锛岃妫�鏌ュ叆鍙�");
throw new BaseException("鏂板浠诲姟鍏ュ弬涓虹┖锛岃妫�鏌ュ叆鍙�");
}
- Integer integer = 1;
- //ServiceSubtask serviceTask = DtoConversionUtils.sourceToTarget(serviceTaskVO, ServiceSubtask.class);
- //serviceTask.setTextParam(JSON.toJSONString(serviceTaskVO.getTextParam()));
//灏嗕换鍔′俊鎭斁鍒版湇鍔¤〃涓�
- ServiceSubtask serviceSubtask = DtoConversionUtils.sourceToTarget(serviceTaskVO, ServiceSubtask.class);
- serviceSubtask.setTaskid(serviceTaskVO.getTaskguid());
+ ServiceSubtask serviceSubtask = new ServiceSubtask();
+ serviceSubtask.setTaskGuid(serviceTaskVO.getTaskguid());
String type = "0";
- if (serviceTaskVO.getServicetype().equals("鐩戞祴璇勪及")) {
- type = "1";
- } else if (serviceTaskVO.getServicetype().equals("鍑洪櫌闅忚")) {
- type = "2";
- } else if (serviceTaskVO.getServicetype().equals("闂ㄨ瘖闅忚")) {
- type = "3";
- } else if (serviceTaskVO.getServicetype().equals("瀹ｆ暀鍏虫��")) {
- type = "4";
- } else if (serviceTaskVO.getServicetype().equals("澶嶈瘖閫氱煡")) {
- type = "5";
- } else if (serviceTaskVO.getServicetype().equals("婊℃剰搴﹁皟鏌�")) {
- type = "6";
- } else if (serviceTaskVO.getServicetype().equals("鎮ｈ�呮姤鍛�")) {
- type = "7";
- } else if (serviceTaskVO.getServicetype().equals("鍏朵粬閫氱煡")) {
- type = "8";
- }
- if (type.equals("0")) {
- type = serviceTaskVO.getServicetype();
- }
+ if (StringUtils.isNotEmpty(serviceTaskVO.getServicetype()))
+ type = ServiceTaskTypeEnum.getDescByCode(serviceTaskVO.getServicetype());
serviceSubtask.setServiceType(type);
- //0銆�1瀹ｆ暀銆�2闂ㄨ瘖銆�3鍑洪櫌銆�4澶嶈瘖銆�5浣撴銆�6闂嵎銆�7鍖绘妧
String tasktype = "-1";
- if (serviceTaskVO.getTasktype().equals("閫氱煡")) {
- tasktype = "0";
- } else if (serviceTaskVO.getTasktype().equals("瀹ｆ暀")) {
- tasktype = "1";
- } else if (serviceTaskVO.getTasktype().equals("闂ㄨ瘖")) {
- tasktype = "2";
- } else if (serviceTaskVO.getTasktype().equals("鍑洪櫌")) {
- tasktype = "3";
- } else if (serviceTaskVO.getTasktype().equals("澶嶈瘖")) {
- tasktype = "4";
- } else if (serviceTaskVO.getTasktype().equals("浣撴")) {
- tasktype = "5";
- } else if (serviceTaskVO.getTasktype().equals("闂嵎")) {
- tasktype = "6";
- } else if (serviceTaskVO.getTasktype().equals("鍖绘妧")) {
- tasktype = "7";
- }
- if (tasktype.equals("-1")) {
- tasktype = serviceTaskVO.getTasktype();
- }
+ if (StringUtils.isNotEmpty(serviceTaskVO.getTasktype()))
+ tasktype = TaskTypeEnum.getDescByCode(serviceTaskVO.getTasktype());
serviceSubtask.setType(tasktype);
serviceSubtask.setLabelstatus(serviceTaskVO.getTaskstate());
serviceSubtask.setTaskName(serviceTaskVO.getTaskname());
serviceSubtask.setTaskDesc(serviceTaskVO.getTaskdesc());
serviceSubtask.setPreachform(serviceTaskVO.getExemode());
- //serviceSubtask.setUploadTime(serviceTaskVO.setUploadTime());
serviceSubtask.setCreateBy(serviceTaskVO.getCreateBy());
serviceSubtask.setCreateTime(serviceTaskVO.getCreateTime());
serviceSubtask.setOperatorNo(serviceTaskVO.getOperatorno());
@@ -272,6 +234,7 @@
serviceSubtask.setEndtime(serviceTaskVO.getFinishtime());
serviceSubtask.setResult(serviceTaskVO.getResult());
serviceSubtask.setSuggest(serviceTaskVO.getSuggest());
+ serviceSubtask.setDelFlag(serviceTaskVO.getDelflag());
serviceSubtask.setOrgid(serviceTaskVO.getOrgguid());
serviceSubtask.setPatid(serviceTaskVO.getPatguid());
serviceSubtask.setSendname(serviceTaskVO.getPatname());
@@ -286,31 +249,29 @@
serviceSubtask.setWechat(serviceTaskVO.getPatopenid());
serviceSubtask.setInhospno(serviceTaskVO.getInhosno());
String hosptype = "-1";
- if (serviceTaskVO.getVisittype().equals("闂ㄨ瘖")) {
- hosptype = "1";
- } else if (serviceTaskVO.getVisittype().equals("鍑洪櫌")) {
- hosptype = "2";
- } else if (serviceTaskVO.getVisittype().equals("涓撶梾")) {
- hosptype = "3";
- } else if (serviceTaskVO.getVisittype().equals("澶栭儴瀵煎叆")) {
- hosptype = "4";
- }
- if (hosptype.equals("-1")) {
- hosptype = serviceTaskVO.getVisittype();
- }
+ hosptype = HospTypeEnum.getDescByCode(serviceTaskVO.getVisittype());
serviceSubtask.setHospType(hosptype);
serviceSubtask.setHospno(serviceTaskVO.getVisitno());
serviceSubtask.setAdmindate(serviceTaskVO.getVisittime());
serviceSubtask.setRoomno(serviceTaskVO.getRoomno());
serviceSubtask.setBedNo(serviceTaskVO.getBedno());
serviceSubtask.setDeptname(serviceTaskVO.getDeptname());
- //serviceSubtask.setSendname(serviceTaskVO.gets());
- //serviceSubtask.setPatid(serviceTaskVO.getPid());
+ serviceSubtask.setDeptcode(serviceTaskVO.getDeptcode());
serviceSubtask.setSendstate(1L);
- //serviceSubtask.setHospType(serviceTask.getHospType());
serviceSubtask.setCreateTime(new Date());
- serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
- integer = serviceSubtask.getId().intValue();
+ serviceSubtask.setLeavehospitaldistrictcode(serviceTaskVO.getDistrictcode());
+ //鍏堟煡璇竴閬嶏紝璇askGuid鏄惁瀛樺湪
+ ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
+ serviceSubtaskVO.setTaskGuid(serviceTaskVO.getTaskguid());
+ List<ServiceSubtask> serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
+ if (CollectionUtils.isNotEmpty(serviceSubtaskList)) {
+ serviceSubtask.setId(serviceSubtaskList.get(0).getId());
+ serviceSubtask.setUpdateTime(new Date());
+ serviceSubtaskMapper.updateServiceSubtaskByTaskGuid(serviceSubtask);
+ } else {
+ serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
+ }
+ Integer integer = serviceSubtask.getId().intValue();
log.error("鎻掑叆鐨処D鏄細{}", integer);
return integer;
}
@@ -339,7 +300,6 @@
List<BaseOrganization> baseOrganizations = baseOrganizationMapper.selectBaseOrganizationList(baseOrganization);
if (CollectionUtils.isNotEmpty(baseOrganizations)) {
YongHuXX yongHuXX = serviceQueryInfo.getYeWuXX().getYongHuXX();
- yongHuXX.setYongHuID(baseOrganizations.get(0).getOrgid());
yongHuXX.setZuZhiJGID(baseOrganizations.get(0).getGuid());
yongHuXX.setZuZhiJGMC(baseOrganizations.get(0).getOrganizationName());
serviceQueryInfo.getYeWuXX().setYongHuXX(yongHuXX);
--
Gitblit v1.9.3