From 719e567eab5a65ea8ed8ce3c8c9c1da3adae6883 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=87=E5=AE=99=E7=9A=AE=E7=9A=AE=E5=A8=83?=
<2964346877@qq.com>
Date: Wed, 14 Jun 2023 10:20:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E9=99=A2=E8=AE=B0=E5=BD=95=E6=96=B0?=
=?UTF-8?q?=E5=A2=9E=E5=92=8C=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../server/collection/dto/TBasicDto.java | 1 +
.../service/impl/TBasicServiceImpl.java | 6 +-
.../docus/server/collection/util/Result.java | 76 +++++
.../collection/webservice/BasicService.java | 10 +
.../collection/webservice/ReceiveServer.java | 10 +
.../webservice/impl/BasicServiceImpl.java | 310 ++++++++++++++++++
.../webservice/impl/ReceiveServerImpl.java | 10 +
src/main/resources/mapper/TBasicMapper.xml | 7 +-
8 files changed, 426 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/docus/server/collection/dto/TBasicDto.java b/src/main/java/com/docus/server/collection/dto/TBasicDto.java
index b33d641..91496d1 100644
--- a/src/main/java/com/docus/server/collection/dto/TBasicDto.java
+++ b/src/main/java/com/docus/server/collection/dto/TBasicDto.java
@@ -21,6 +21,7 @@ public class TBasicDto {
private String name ;
private String admissDate ;
private String disDate ;
+ private String admissDept;
private String admissDeptName ;
private String disDeptName ;
private String attendingName;
diff --git a/src/main/java/com/docus/server/collection/service/impl/TBasicServiceImpl.java b/src/main/java/com/docus/server/collection/service/impl/TBasicServiceImpl.java
index 7909f14..8d6ac0b 100644
--- a/src/main/java/com/docus/server/collection/service/impl/TBasicServiceImpl.java
+++ b/src/main/java/com/docus/server/collection/service/impl/TBasicServiceImpl.java
@@ -66,7 +66,7 @@ public class TBasicServiceImpl implements ITBasicService {
age=Integer.parseInt(ageStr);
}
String sexName=tBasicDto.getSexName();
- if(sexName.length()>1){
+ if(Func.isNotEmpty(sexName)&&sexName.length()>1){
sexName=sexName.substring(0,1);
}
String admissDaysStr = tBasicDto.getAdmissDays();
@@ -89,6 +89,7 @@ public class TBasicServiceImpl implements ITBasicService {
tBasic.setName(tBasicDto.getName());
tBasic.setAdmissDate(admissDate);
tBasic.setDisDate(disDate);
+ tBasic.setAdmissDept(tBasicDto.getAdmissDept());
tBasic.setAdmissDeptName(tBasicDto.getAdmissDeptName());
tBasic.setDisDeptName(tBasicDto.getDisDeptName());
tBasic.setAttending(tBasicDto.getAttending());
@@ -145,7 +146,7 @@ public class TBasicServiceImpl implements ITBasicService {
age=Integer.parseInt(ageStr);
}
String sexName=tBasicDto.getSexName();
- if(sexName.length()>1){
+ if(Func.isNotEmpty(sexName)&&sexName.length()>1){
sexName=sexName.substring(0,1);
}
String admissDaysStr = tBasicDto.getAdmissDays();
@@ -169,6 +170,7 @@ public class TBasicServiceImpl implements ITBasicService {
tBasic.setName(tBasicDto.getName());
tBasic.setAdmissDate(admissDate);
tBasic.setDisDate(disDate);
+ tBasic.setAdmissDept(tBasicDto.getAdmissDept());
tBasic.setAdmissDeptName(tBasicDto.getAdmissDeptName());
tBasic.setDisDeptName(tBasicDto.getDisDeptName());
tBasic.setAttending(tBasicDto.getAttending());
diff --git a/src/main/java/com/docus/server/collection/util/Result.java b/src/main/java/com/docus/server/collection/util/Result.java
index 1534207..37e5d4a 100644
--- a/src/main/java/com/docus/server/collection/util/Result.java
+++ b/src/main/java/com/docus/server/collection/util/Result.java
@@ -97,4 +97,80 @@ public class Result {
"\n";
}
+ public static String successMessage(String serialId,String receive,String send){
+
+ String createTime= Func.format(new Date(), DateUtil.PATTERN_DATETIME_MINI);
+
+ String message="成功";
+
+ return "\n" +
+ "\t\n" +
+ "\t\n" +
+ "\t\n" +
+ "\t\n" +
+ "\t\n" +
+ "\t\n" +
+ "\t\n" +
+ "\t\t\n" +
+ "\t\t\t\n" +
+ "\t\t\t\t- \n" +
+ "\t\t\t
\n" +
+ "\t\t\n" +
+ "\t\n" +
+ "\t\n" +
+ "\t\t\n" +
+ "\t\t\t\n" +
+ "\t\t\t\t- \n" +
+ "\t\t\t
\n" +
+ "\t\t\n" +
+ "\t\n" +
+ "\t\n" +
+ "\t\t\n" +
+ "\t\t\n" +
+ "\t\t\t\n" +
+ "\t\t\n" +
+ "\t\t\n" +
+ "\t\t\t\n" +
+ "\t\t\n" +
+ "\t\n" +
+ "\n";
+ }
+ public static String failedMessage(String serialId,String message,String receive,String send){
+
+ String createTime= Func.format(new Date(), DateUtil.PATTERN_DATETIME_MINI);
+
+
+ return "\n" +
+ "\t\n" +
+ "\t\n" +
+ "\t\n" +
+ "\t\n" +
+ "\t\n" +
+ "\t\n" +
+ "\t\n" +
+ "\t\t\n" +
+ "\t\t\t\n" +
+ "\t\t\t\t- \n" +
+ "\t\t\t
\n" +
+ "\t\t\n" +
+ "\t\n" +
+ "\t\n" +
+ "\t\t\n" +
+ "\t\t\t\n" +
+ "\t\t\t\t- \n" +
+ "\t\t\t
\n" +
+ "\t\t\n" +
+ "\t\n" +
+ "\t\n" +
+ "\t\t\n" +
+ "\t\t\n" +
+ "\t\t\t\n" +
+ "\t\t\n" +
+ "\t\t\n" +
+ "\t\t\t\n" +
+ "\t\t\n" +
+ "\t\n" +
+ "\n";
+ }
+
}
diff --git a/src/main/java/com/docus/server/collection/webservice/BasicService.java b/src/main/java/com/docus/server/collection/webservice/BasicService.java
index b921002..0da1ce8 100644
--- a/src/main/java/com/docus/server/collection/webservice/BasicService.java
+++ b/src/main/java/com/docus/server/collection/webservice/BasicService.java
@@ -13,4 +13,14 @@ public interface BasicService {
* @description更新基础数据
*/
public String updateTBasic(String str);
+
+ /**
+ * @description新增入院基础数据
+ */
+ public String setAdmissTBasic(String message);
+
+ /**
+ * @description住院就诊更新基础数据
+ */
+ public String updateAdmissTBasic(String message);
}
diff --git a/src/main/java/com/docus/server/collection/webservice/ReceiveServer.java b/src/main/java/com/docus/server/collection/webservice/ReceiveServer.java
index 3ac7ec0..0307b8f 100644
--- a/src/main/java/com/docus/server/collection/webservice/ReceiveServer.java
+++ b/src/main/java/com/docus/server/collection/webservice/ReceiveServer.java
@@ -21,6 +21,16 @@ public interface ReceiveServer {
String updateTBasic(String str);
+ /**
+ * @description新增入院基础数据
+ */
+ public String setAdmissTBasic(String message);
+
+ /**
+ * @description住院就诊更新基础数据
+ */
+ public String updateAdmissTBasic(String message);
+
/**
* 用户信息接收,进行操作
*
diff --git a/src/main/java/com/docus/server/collection/webservice/impl/BasicServiceImpl.java b/src/main/java/com/docus/server/collection/webservice/impl/BasicServiceImpl.java
index d37e280..40d5a0f 100644
--- a/src/main/java/com/docus/server/collection/webservice/impl/BasicServiceImpl.java
+++ b/src/main/java/com/docus/server/collection/webservice/impl/BasicServiceImpl.java
@@ -70,6 +70,49 @@ public class BasicServiceImpl implements BasicService {
}
+ @Override
+ public String setAdmissTBasic(String message) {
+ log.info("新增入院基础数据:{}", message);
+
+ if (Func.isEmpty(message)) {
+ return Result.failedMessage(null,"参数为空",null,null);
+ }
+ //解析xml
+ TBasicDto tBasicDto = null;
+ try {
+ tBasicDto=getAdmissTBasicDto(message);
+ //持久化
+ tBasicService.setTBasic(tBasicDto);
+ }catch (Exception e){
+ e.printStackTrace();
+ log.error("住院号:"+tBasicDto.getJzh()+" 异常信息:\n"+e.getMessage(), e);
+ return Result.failedMessage(tBasicDto.getSerialId(),e.getMessage(),tBasicDto.getReceive(),tBasicDto.getSend());
+ }
+ return Result.successMessage(tBasicDto.getSerialId(),tBasicDto.getReceive(),tBasicDto.getSend());
+
+ }
+
+ @Override
+ public String updateAdmissTBasic(String message) {
+ log.info("修改基础数据:{}", message);
+ if (Func.isEmpty(message)) {
+ return Result.failedMessage(null,"参数为空",null,null);
+ }
+ //解析xml
+ TBasicDto tBasicDto = null;
+ try {
+ tBasicDto=getUpdateAdmissTBasicDto(message);
+ //持久化
+ tBasicService.updateTBasic(tBasicDto);
+ }catch (Exception e){
+ e.printStackTrace();
+ log.error(e.getMessage(), e);
+ return Result.failedMessage(tBasicDto.getSerialId(),e.getMessage(),tBasicDto.getReceive(),tBasicDto.getSend());
+ }
+ return Result.successMessage(tBasicDto.getSerialId(),tBasicDto.getReceive(),tBasicDto.getSend());
+
+ }
+
public TBasicDto getNewTBasicDto(String str) {
XmlUtil xml=XmlUtil.of(str);
@@ -423,5 +466,272 @@ public class BasicServiceImpl implements BasicService {
return dto;
}
+ public TBasicDto getAdmissTBasicDto(String message) {
+ XmlUtil xml=XmlUtil.of(message);
+ //id-消息流水号
+ String serialId=null;
+ Node serialIdNode = xml.getNode("/PRPA_HIP1069/id/@extension");
+ if(Func.isNotEmpty(serialIdNode)){
+ serialId=serialIdNode.getNodeValue();
+ }
+ //接受方
+ String receive=null;
+ Node receiveNode = xml.getNode("/PRPA_HIP1069/receiver/device/id/item/@extension");
+ if(Func.isNotEmpty(receiveNode)){
+ receive=receiveNode.getNodeValue();
+ }
+ //发送方
+ String send=null;
+ Node sendNode = xml.getNode("/PRPA_HIP1069/sender/device/id/item/@extension");
+ if(Func.isNotEmpty(sendNode)){
+ send=sendNode.getNodeValue();
+ }
+ //住院流水号*
+ String jzh=null;
+ Node jzhNode = xml.getNode("/PRPA_HIP1070/controlActProcess/encounterEvent/item/@extension");
+ if(Func.isNotEmpty(jzhNode)){
+ jzh=jzhNode.getNodeValue();
+ }
+ //住院号标识
+ String inpatientNo=null;
+ Node inpatientNoNode = xml.getNode("/PRPA_HIP1070/controlActProcess/encounterEvent/id/item/@extension");
+ if(Func.isNotEmpty(inpatientNoNode)){
+ inpatientNo=inpatientNoNode.getNodeValue();
+ }
+ //住院次数[]
+ String admissTimes=null;
+ Node admissTimesNode = xml.getNode("/PRPA_HIP1070/controlActProcess/encounterEvent/lengthOfStayQuantity/@value");
+ if(Func.isNotEmpty(admissTimesNode)){
+ admissTimes=admissTimesNode.getNodeValue();
+ }
+ //姓名
+ String name=null;
+ Node nameNode = xml.getNode("/PRPA_HIP1070/controlActProcess/encounterEvent/subject/patient/patientPerson/name/item/part/@value");
+ if(Func.isNotEmpty(nameNode)){
+ name=nameNode.getNodeValue();
+ }
+ //入院日期时间
+ String admissDate=null;
+ Node admissDateNode = xml.getNode("/PRPA_HIP0032/controlActProcess/subject/encounterEvent/effectiveTime/low/@value");
+ if(Func.isNotEmpty(admissDateNode)){
+ admissDate=admissDateNode.getNodeValue();
+ }
+ //入院诊断科室名称[]
+ String admissDeptName=null;
+ Node admissDeptNameNode = xml.getNode("/PRPA_HIP1070/controlActProcess/subject/component/location1/serviceDeliveryLocation/location/name/item/part/@value");
+ if(Func.isNotEmpty(admissDeptNameNode)){
+ admissDeptName=admissDeptNameNode.getNodeValue();
+ }
+ //主治医师[]
+ String attending=null;
+ Node attendingNode = xml.getNode("/PRPA_HIP1070/controlActProcess/subject/component/execute/assignedEntity/id/item/@extension");
+ if(Func.isNotEmpty(attendingNode)){
+ attending=attendingNode.getTextContent();
+ }
+ //主治医师名称[]
+ String attendingName=null;
+ Node attendingNameNode = xml.getNode("/PRPA_HIP1070/controlActProcess/subject/component/execute/assignedEntity/assignedPerson/name/item/part/@value");
+ if(Func.isNotEmpty(attendingNameNode)){
+ attendingName=attendingNameNode.getTextContent();
+ }
+
+ //身份证号
+ String idCard=null;
+ Node idCardNode = xml.getNode("/PRPA_HIP1070/controlActProcess/encounterEvent/subject/patient/patientPerson/id/item/@extension");
+ if(Func.isNotEmpty(idCardNode)){
+ idCard=idCardNode.getNodeValue();
+ }
+ //入院科室
+ String admissDept=null;
+ Node admissDeptCardNode = xml.getNode("/PRPA_HIP1070/controlActProcess/subject/component/location1/serviceDeliveryLocation/location/id/item/@extension");
+ if(Func.isNotEmpty(admissDeptCardNode)){
+ admissDept=admissDeptCardNode.getNodeValue();
+ }
+ //床位号
+ String bedNum=null;
+ Node bedNumNode = xml.getNode("/PRPA_HIP1070/controlActProcess/subject/component/location1/serviceDeliveryLocation/location/locatedEntityHasParts/locatedPlace/locatedEntityHasParts/locatedPlace/locatedEntityHasParts/locatedPlace/id/item/@extension");
+ if(Func.isNotEmpty(bedNumNode)){
+ bedNum=bedNumNode.getNodeValue();
+ }
+ //病区编号
+ String wardCode=null;
+ Node wardCodeNode = xml.getNode("/PRPA_HIP1070/controlActProcess/subject/component/location1/serviceDeliveryLocation/location/locatedEntityHasParts/locatedPlace/id/item/@extension");
+ if(Func.isNotEmpty(wardCodeNode)){
+ wardCode=wardCodeNode.getNodeValue();
+ }
+ //病区名称
+ String wardName=null;
+ Node wardNameNode = xml.getNode("/PRPA_HIP1070/controlActProcess/subject/component/location1/serviceDeliveryLocation/location/locatedEntityHasParts/locatedPlace/name/item/part/@value");
+ if(Func.isNotEmpty(wardNameNode)){
+ wardName=wardNameNode.getTextContent();
+ }
+ //顺德人医第三方索引
+// String sdryIndex=null;
+// Node sdryIndexNode = xml.getNode("/PRPA_HIP0032/controlActProcess/subject/encounterEvent/subject/patient/id/item/@extension");
+// if(Func.isNotEmpty(sdryIndexNode)){
+// sdryIndex=sdryIndexNode.getNodeValue();
+// }
+
+ //设置dto
+ TBasicDto dto=new TBasicDto();
+ dto.setSerialId(serialId);
+ dto.setSend(send);
+ dto.setReceive(receive);
+ dto.setInpatientNo(inpatientNo);
+ dto.setName(name);
+ dto.setJzh(jzh);
+ dto.setAdmissDept(admissDept);
+ dto.setAdmissDeptName(admissDeptName);
+ dto.setAdmissDate(admissDate);
+ dto.setAdmissTimes(admissTimes);
+ dto.setAttending(attending);
+ dto.setAttendingName(attendingName);
+ dto.setIdCard(idCard);
+ dto.setBedNum(bedNum);
+ dto.setWardCode(wardCode);
+ dto.setWardName(wardName);
+ return dto;
+ }
+
+ public TBasicDto getUpdateAdmissTBasicDto(String str) {
+ XmlUtil xml=XmlUtil.of(str);
+ //id-消息流水号
+ String serialId=null;
+ Node serialIdNode = xml.getNode("/PRPA_HIP0027/id/@extension");
+ if(Func.isNotEmpty(serialIdNode)){
+ serialId=serialIdNode.getNodeValue();
+ }
+ //接受方
+ String receive=null;
+ Node receiveNode = xml.getNode("/PRPA_HIP0027/receiver/device/id/item/@extension");
+ if(Func.isNotEmpty(receiveNode)){
+ receive=receiveNode.getNodeValue();
+ }
+ //发送方
+ String send=null;
+ Node sendNode = xml.getNode("/PRPA_HIP0027/sender/device/id/item/@extension");
+ if(Func.isNotEmpty(sendNode)){
+ send=sendNode.getNodeValue();
+ }
+ //住院流水号
+ String jzh=null;
+ Node jzhNode = xml.getNode("/PRPA_HIP0027/controlActProcess/subject/encounterEvent/id/item[1]/@extension");
+ if(Func.isNotEmpty(jzhNode)){
+ jzh=jzhNode.getNodeValue();
+ }
+ //住院号标识
+ String inpatientNo=null;
+ Node inpatientNoNode = xml.getNode("/PRPA_HIP0027/controlActProcess/subject/encounterEvent/id/item[0]/@extension");
+ if(Func.isNotEmpty(inpatientNoNode)){
+ inpatientNo=inpatientNoNode.getNodeValue();
+ }
+ //住院次数[]
+ String admissTimes=null;
+ Node admissTimesNode = xml.getNode("/PRPA_HIP0027/controlActProcess/subject/encounterEvent/lengthOfStayQuantity[@unit='次']/@value");
+ if(Func.isNotEmpty(admissTimesNode)){
+ admissTimes=admissTimesNode.getNodeValue();
+ }
+ //姓名
+ String name=null;
+ Node nameNode = xml.getNode("/PRPA_HIP0027/controlActProcess/subject/encounterEvent/subject/patient/patientPerson/name/item/part/@value");
+ if(Func.isNotEmpty(nameNode)){
+ name=nameNode.getNodeValue();
+ }
+ //入院日期时间
+ String admissDate=null;
+ Node admissDateNode = xml.getNode("/PRPA_HIP0027/controlActProcess/subject/encounterEvent/effectiveTime/low/@value");
+ if(Func.isNotEmpty(admissDateNode)){
+ admissDate=admissDateNode.getNodeValue();
+ }
+ //入院诊断科室名称[]
+ String admissDeptName=null;
+ Node admissDeptNameNode = xml.getNode("/PRPA_HIP0027/controlActProcess/subject/encounterEvent/location/serviceDeliveryLocation/location/name/item/part/@value");
+ if(Func.isNotEmpty(admissDeptNameNode)){
+ admissDeptName=admissDeptNameNode.getNodeValue();
+ }
+ //入院诊断科室
+ String admissDept=null;
+ Node admissDeptNode = xml.getNode("/PRPA_HIP0027/controlActProcess/subject/encounterEvent/location/serviceDeliveryLocation/location/id/item/@extension");
+ if(Func.isNotEmpty(admissDeptNameNode)){
+ admissDept=admissDeptNode.getNodeValue();
+ }
+ //主治医师[]
+ String attending=null;
+ Node attendingNode = xml.getNode("/PRPA_HIP0027/controlActProcess/subject/encounterEvent/authenticator/assignedEntity/id/item/@extension");
+ if(Func.isNotEmpty(attendingNode)){
+ attending=attendingNode.getNodeValue();
+ }
+ //主治医师[]
+ String attendingName=null;
+ Node attendingNameNode = xml.getNode("/PRPA_HIP0027/controlActProcess/subject/encounterEvent/authenticator/assignedEntity/assignedPerson/name");
+ if(Func.isNotEmpty(attendingNameNode)){
+ attendingName=attendingNameNode.getTextContent();
+ }
+ //年龄
+ String age=null;
+ Node ageNode = xml.getNode("/PRPA_HIP0027/controlActProcess/subject/encounterEvent/subject/patient/patientPerson/age/@value");
+ if(Func.isNotEmpty(ageNode)){
+ age=ageNode.getNodeValue();
+ }
+ //性别
+ String sex=null;
+ Node sexNode = xml.getNode("/PRPA_HIP0027/controlActProcess/subject/encounterEvent/subject/patient/patientPerson/genderCode/@value");
+ if(Func.isNotEmpty(sexNode)){
+ sex=sexNode.getNodeValue();
+ }
+ //身份证号
+ String idCard=null;
+ Node idCardNode = xml.getNode("/PRPA_HIP0027/controlActProcess/subject/encounterEvent/subject/patient/patientPerson/id/item/@extension");
+ if(Func.isNotEmpty(idCardNode)){
+ idCard=idCardNode.getNodeValue();
+ }
+ //性别名称
+ String sexName=null;
+ Node sexNameNode = xml.getNode("/PRPA_HIP0027/controlActProcess/subject/encounterEvent/subject/patient/patientPerson/genderName/@value");
+ if(Func.isNotEmpty(sexNameNode)){
+ sexName=sexNameNode.getNodeValue();
+ }
+ //病区编号
+ String wardCode=null;
+ Node wardCodeNode = xml.getNode("/PRPA_HIP0027/controlActProcess/subject/encounterEvent/location/serviceDeliveryLocation/location/locatedEntityHasParts/locatedPlace/id/item/@extension");
+ if(Func.isNotEmpty(wardCodeNode)){
+ wardCode=wardCodeNode.getNodeValue();
+ }
+ //病区名称
+ String wardName=null;
+ Node wardNameNode = xml.getNode("/PRPA_HIP0027/controlActProcess/subject/encounterEvent/location/serviceDeliveryLocation/location/locatedEntityHasParts/locatedPlace/name/item/part/@value");
+ if(Func.isNotEmpty(wardNameNode)){
+ wardName=wardNameNode.getNodeValue();
+ }
+ //顺德人医第三方索引
+// String sdryIndex=null;
+// Node sdryIndexNode = xml.getNode("/PRPA_HIP0027/controlActProcess/subject/encounterEvent/subject/patient/id/item/@extension");
+// if(Func.isNotEmpty(sdryIndexNode)){
+// sdryIndex=sdryIndexNode.getNodeValue();
+// }
+
+ //设置dto
+ TBasicDto dto=new TBasicDto();
+ dto.setSerialId(serialId);
+ dto.setSend(send);
+ dto.setReceive(receive);
+ dto.setInpatientNo(inpatientNo);
+ dto.setName(name);
+ dto.setJzh(jzh);
+ dto.setAdmissDept(admissDept);
+ dto.setAdmissDeptName(admissDeptName);
+ dto.setAdmissDate(admissDate);
+ dto.setAdmissTimes(admissTimes);
+ dto.setAttending(attending);
+ dto.setAttendingName(attendingName);
+ dto.setAge(age);
+ dto.setSex(sex);
+ dto.setIdCard(idCard);
+ dto.setSexName(sexName);
+ dto.setWardCode(wardCode);
+ dto.setWardName(wardName);
+ return dto;
+ }
+
}
diff --git a/src/main/java/com/docus/server/collection/webservice/impl/ReceiveServerImpl.java b/src/main/java/com/docus/server/collection/webservice/impl/ReceiveServerImpl.java
index 5360b43..681eae6 100644
--- a/src/main/java/com/docus/server/collection/webservice/impl/ReceiveServerImpl.java
+++ b/src/main/java/com/docus/server/collection/webservice/impl/ReceiveServerImpl.java
@@ -46,6 +46,16 @@ public class ReceiveServerImpl implements ReceiveServer {
return basicService.updateTBasic(str);
}
+ @Override
+ public String setAdmissTBasic(String message) {
+ return basicService.setAdmissTBasic(message);
+ }
+
+ @Override
+ public String updateAdmissTBasic(String message) {
+ return basicService.updateAdmissTBasic(message) ;
+ }
+
@Override
public String userModify(String receiveUser) {
return userServer.userModify(receiveUser);
diff --git a/src/main/resources/mapper/TBasicMapper.xml b/src/main/resources/mapper/TBasicMapper.xml
index b61a642..cee4ff8 100644
--- a/src/main/resources/mapper/TBasicMapper.xml
+++ b/src/main/resources/mapper/TBasicMapper.xml
@@ -15,11 +15,11 @@
INSERT INTO `docus_medicalrecord`.`t_basic`
- (`admiss_days`,`is_dead`,`sex_name`,`bed_num`,`age`,`sex`,`id_card`,`dis_dept`,`patient_id`, `admiss_times`, `inpatient_no`,`name`, `admiss_date`, `admiss_dept_name`, `dis_date`, `dis_dept_name`,`attending`,`attending_name`,`jzh`,`create_time`)
+ (`admiss_days`,`is_dead`,`sex_name`,`bed_num`,`age`,`sex`,`id_card`,`dis_dept`,`patient_id`, `admiss_times`, `inpatient_no`,`name`, `admiss_date`,`admiss_dept`, `admiss_dept_name`, `dis_date`, `dis_dept_name`,`attending`,`attending_name`,`jzh`,`create_time`)
VALUES
(#{tBasic.admissDays},#{tBasic.isDead},#{tBasic.sexName},#{tBasic.bedNum},#{tBasic.age},#{tBasic.sex},#{tBasic.idCard},
#{tBasic.disDept},#{tBasic.patientId},#{tBasic.admissTimes},#{tBasic.inpatientNo},
- #{tBasic.name},#{tBasic.admissDate},#{tBasic.admissDeptName},#{tBasic.disDate},#{tBasic.disDeptName},
+ #{tBasic.name},#{tBasic.admissDate},#{tBasic.admissDept},#{tBasic.admissDeptName},#{tBasic.disDate},#{tBasic.disDeptName},
#{tBasic.attending},#{tBasic.attendingName},#{tBasic.jzh},now())
@@ -68,6 +68,9 @@
`admiss_date`=#{tBasic.admissDate},
+
+ `admiss_dept`=#{tBasic.admissDept},
+
`admiss_dept_name`=#{tBasic.admissDeptName},