From 718bd7efbc0d959d0b9050c34be2fd639a1f74b6 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 26 二月 2025 18:03:27 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java | 81 +++++++++++++++++++++++++---------------
1 files changed, 50 insertions(+), 31 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
index 1f72652..81ba025 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -1,31 +1,28 @@
package com.smartor.service.impl;
-import java.lang.reflect.Field;
-
import cn.hutool.core.bean.BeanUtil;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.StringUtils;
import com.smartor.domain.*;
import com.smartor.mapper.*;
import com.smartor.service.IServiceExternalService;
-import com.smartor.service.IServiceSubtaskRecordService;
import com.smartor.service.IServiceSubtaskService;
-import io.swagger.annotations.ApiModelProperty;
+import org.springframework.beans.factory.annotation.Value;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
-import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import javax.security.auth.login.CredentialNotFoundException;
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -52,11 +49,10 @@
@Autowired
private PatMedOperationItemMapper patMedOperationItemMapper;
@Autowired
- private Icd10AssociationMapper icd10AssociationMapper;
+ private Icd10Mapper icd10Mapper;
- @Autowired
- private IServiceSubtaskService iServiceSubtaskService;
-
+ @Value("${defaultPwd}")
+ private String defaultPwd;
public Boolean generalInterface(Map dataMap) {
Map XiaoXiTou = (Map) dataMap.get("XiaoXiTou");
@@ -117,11 +113,15 @@
ExternalUserInfo externalUserInfo = BeanUtil.mapToBean(yongHuXX, ExternalUserInfo.class, true);
SysUser sysUser = new SysUser();
sysUser.setGuid(externalUserInfo.getZuZhiJGID());
- sysUser.setUserName(externalUserInfo.getYongHuID());
+ sysUser.setUserName(externalUserInfo.getYongHuDLM());
sysUser.setNickName(externalUserInfo.getYongHuXM());
sysUser.setUserType("");
sysUser.setDeptId(null);
sysUser.setTitle(null);
+
+ BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
+ sysUser.setPassword(passwordEncoder.encode(defaultPwd));
+
sysUser.setHisUserId(externalUserInfo.getYongHuID());
sysUser.setPhonenumber(externalUserInfo.getLianXiDH());
sysUser.setJobPhone(externalUserInfo.getGongZuoDH());
@@ -337,20 +337,20 @@
Map yeWuXX = (Map) dataMap.get("YeWuXX");
Map<String, Object> JiBing = (Map<String, Object>) yeWuXX.get("JiBing");
ExternalDiseaseInfo externalDiseaseInfo = BeanUtil.mapToBean(JiBing, ExternalDiseaseInfo.class, true);
- Icd10Association icd10Association = new Icd10Association();
- icd10Association.setIcd10code(externalDiseaseInfo.getJiBingID());
- icd10Association.setIcd10name(externalDiseaseInfo.getJiBingMC());
- icd10Association.setGuid(externalDiseaseInfo.getZuZhiJGID());
- icd10Association.setOrgid(externalDiseaseInfo.getZuZhiJGID());
- icd10Association.setPid(externalDiseaseInfo.getFUJIBID());
- icd10Association.setIcd10AssortCode(externalDiseaseInfo.getJiBingFLDM());
- icd10Association.setIcd10AssortName(externalDiseaseInfo.getJiBingFLMC());
- icd10Association.setChineseMedicineDiagnoseSign(externalDiseaseInfo.getZhongYiZDBZ());
- icd10Association.setChineseMedicineDiagnoseAssortCode(externalDiseaseInfo.getZhongYiZDFLDM());
- icd10Association.setChineseMedicineDiagnoseAssortName(externalDiseaseInfo.getZhongYiZDFLMC());
- icd10Association.setOutpatientUseAssort(externalDiseaseInfo.getMenZhenSYBZ());
- icd10Association.setInpatientUseAssort(externalDiseaseInfo.getZhuYuanSYBZ());
- icd10AssociationMapper.insertIcd10Association(icd10Association);
+ Icd10 icd10 = new Icd10();
+ icd10.setIcdcode(externalDiseaseInfo.getJiBingID());
+ icd10.setIcdname(externalDiseaseInfo.getJiBingMC());
+ icd10.setGuid(externalDiseaseInfo.getZuZhiJGID());
+ icd10.setOrgid(externalDiseaseInfo.getZuZhiJGID());
+ icd10.setLastflag(externalDiseaseInfo.getMOJIBZ());
+ icd10.setChimedflag("" + externalDiseaseInfo.getZhongYiZDBZ());
+// icd10Association.setIcd10AssortName(externalDiseaseInfo.getJiBingFLMC());
+// icd10Association.setChineseMedicineDiagnoseSign(externalDiseaseInfo.getZhongYiZDBZ());
+// icd10Association.setChineseMedicineDiagnoseAssortCode(externalDiseaseInfo.getZhongYiZDFLDM());
+// icd10Association.setChineseMedicineDiagnoseAssortName(externalDiseaseInfo.getZhongYiZDFLMC());
+// icd10Association.setOutpatientUseAssort(externalDiseaseInfo.getMenZhenSYBZ());
+// icd10Association.setInpatientUseAssort(externalDiseaseInfo.getZhuYuanSYBZ());
+ icd10Mapper.insertIcd10(icd10);
return true;
}
@@ -395,6 +395,9 @@
Map<String, Object> BingRenXX = (Map<String, Object>) yeWuXX.get("BingRenXX");
ExternalInHospPatientInfo externalInHospPatientInfo = BeanUtil.mapToBean(BingRenXX, ExternalInHospPatientInfo.class, true);
+ PatArchive patArchive = addPatArchive(externalInHospPatientInfo, null, null);
+
+
//鎵嬫湳淇℃伅鏂板
Map<String, Object> ssxx = (Map<String, Object>) yeWuXX.get("ShouShuSQ");
//鎵嬫湳鏇存柊
@@ -409,7 +412,7 @@
else if (ObjectUtils.isNotEmpty(sscx))
externalOperationInfo = BeanUtil.mapToBean(sscx, ExternalOperationInfo.class, true);
PatMedOperation patMedOperation = new PatMedOperation();
- patMedOperation.setPatid(null);
+ patMedOperation.setPatid(patArchive.getId());
patMedOperation.setPatcode(externalInHospPatientInfo.getBingRenID());
patMedOperation.setPaname(externalInHospPatientInfo.getXingMing());
// patMedOperation.setOpreqid(externalOperationInfo.getShenQingDID());
@@ -418,8 +421,8 @@
List<PatMedOperation> patMedOperations = patMedOperationMapper.selectPatMedOperationList(patMedOperation);
patMedOperation.setOpsstatus(null);
- patMedOperation.setOperationcode(externalOperationInfo.getShouShuLBDM());
- patMedOperation.setOperationname(externalOperationInfo.getShouShuLBMC());
+ patMedOperation.setOptypecode(externalOperationInfo.getShouShuLBDM());
+ patMedOperation.setOptypename(externalOperationInfo.getShouShuLBMC());
patMedOperation.setOperatortime(externalOperationInfo.getYaoQiuSJ());
patMedOperation.setOpreqtime(externalOperationInfo.getShenQingSJ());
patMedOperation.setReqdoccode(externalOperationInfo.getShenQingYSID());
@@ -470,6 +473,12 @@
if (CollectionUtils.isNotEmpty(patMedOperations)) {
Long id = patMedOperations.get(0).getId();
patMedOperation.setId(id);
+ patMedOperation.setCheckFlag(patMedOperations.get(0).getCheckFlag());
+ //濡傛灉鎵嬫湳鎾ら攢锛岀洿鎺ュ垹闄よ鏉℃墜鏈俊鎭�
+ if (ObjectUtils.isNotEmpty(sscx)) {
+ patMedOperation.setDelFlag("1");
+ //鍚屾椂鍘绘煡璇紝鏄惁鍦╯ubtask涓敓鎴愪换鍔★紝濡傛灉鐢熸垚鍑哄緱绔嬮┈鍒犻櫎
+ }
patMedOperationMapper.updatePatMedOperation(patMedOperation);
} else patMedOperationMapper.insertPatMedOperation(patMedOperation);
log.error("-----patMedOperation鐨勪富閿甶d涓猴細{}", patMedOperation.getId());
@@ -477,6 +486,8 @@
if (ObjectUtils.isNotEmpty(ssxx)) {
Map<String, Object> ShouShuMXList = (Map<String, Object>) ssxx.get("ShouShuMXList");
List<ExternalOperationDetail> externalOperationDetails = BeanUtil.mapToBean(ShouShuMXList, List.class, true);
+ //addMianTableFalg鏄惁闇�瑕佸皢涓绘墜鏈殑淇℃伅鏀惧埌PatMedOperation琛ㄤ腑锛堝彧鏈夌涓�涓富鎵嬫湳淇℃伅闇�瑕佹斁锛屽悗闈㈢殑閮戒笉闇�瑕佹斁浜嗭紝涔熷氨鏄锛岀涓�涓斁瀹屽悗锛屽氨瑕佹妸杩欎釜flag鏀规垚false锛�
+ Boolean addMianTableFalg = true;
for (ExternalOperationDetail externalOperationDetail : externalOperationDetails) {
PatMedOperationItem patMedOperationItem = new PatMedOperationItem();
patMedOperationItem.setOpid(patMedOperation.getId());
@@ -490,6 +501,14 @@
patMedOperationItem.setOpposition(externalOperationDetail.getShouShuBW());
patMedOperationItem.setDelFlag("0");
patMedOperationItem.setOrgid(patMedOperation.getOrgid());
+ if (externalOperationDetail.getZhuShouSBZ().equals("1") && addMianTableFalg == true) {
+ patMedOperation.setOpcode(externalOperationDetail.getShouShuMCID());
+ patMedOperation.setOpdesc(externalOperationDetail.getShouShuMC());
+// patMedOperation.setOpid(externalOperationDetail.getShouShuJBDM());
+ patMedOperationMapper.updatePatMedOperation(patMedOperation);
+ addMianTableFalg = false;
+ }
+
patMedOperationItemMapper.insertPatMedOperationItem(patMedOperationItem);
}
}
--
Gitblit v1.9.3