修改字段名

postdischarge-common/src/main/java/com/xinelu/common/constant/VisitMethodConstants.java

@@ -5,7 +5,7 @@ package com.xinelu.common.constant;
  * @author: haown
  * @create: 2024-03-07 15:45
  **/
-public class VisitTypeConstants {
+public class VisitMethodConstants {
 
 	/**
 	 * 门诊

postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientinfo/PatientInfoController.java

@@ -10,6 +10,7 @@ import com.xinelu.manage.domain.patientinfo.PatientInfo;
 import com.xinelu.manage.dto.patientinfo.PatientInfoDto;
 import com.xinelu.manage.service.patientinfo.IPatientInfoService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import java.util.List;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
@@ -39,6 +40,7 @@ public class PatientInfoController extends BaseController {
 	/**
 	 * 查询患者信息列表
 	 */
+	@ApiOperation("患者档案列表")
 	@PreAuthorize("@ss.hasPermi('manage:patientInfo:list')")
 	@GetMapping("/list")
     public TableDataInfo list(PatientInfoDto patientInfo) {

postdischarge-manage/src/main/java/com/xinelu/manage/controller/signpatientrecord/SignPatientRecordController.java

@@ -14,6 +14,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import java.util.List;
 import javax.annotation.Resource;
+import javax.validation.Valid;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -53,7 +54,7 @@ public class SignPatientRecordController extends BaseController {
 	@ApiOperation("签约/续约")
 	@PreAuthorize("@ss.hasPermi('manage:signRecord:add')")
 	@PostMapping("/sign")
-	public R<String> sign(@RequestBody SignPatientAddDto body) {
+	public R<String> sign(@Valid @RequestBody SignPatientAddDto body) {
 		int flag = signPatientRecordService.add(body);
 		return flag > 0 ? R.ok() : R.fail();
 	}

postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java

@@ -144,11 +144,6 @@ public class PatientInfo extends BaseEntity {
     @Excel(name = "所属病区名称")
     private String wardName;
 
-    /** 住院号 */
-    @ApiModelProperty(value = "住院号")
-    @Excel(name = "住院号")
-    private String admissionNumber;
-
     /** 责任护士 */
     @ApiModelProperty(value = "责任护士")
     private String responsibleNurse;
@@ -189,10 +184,10 @@ public class PatientInfo extends BaseEntity {
     @ApiModelProperty(value = "预约时间（预住院患者），时间格式：yyyy-MM-dd")
     private LocalDate appointmentDate;
 
-    /** 门诊号（门诊患者） */
+    /** 门诊/住院号 */
-    @ApiModelProperty(value = "门诊号")
+    @ApiModelProperty(value = "门诊/住院号 ")
-    @Excel(name = "门诊号", readConverterExp = "门=诊患者")
+    @Excel(name = "门诊/住院号 ", readConverterExp = "门诊/住院号 ")
-    private String outpatientNumber;
+    private String inHospitalNumber;
 
     /** 就诊时间（门诊患者），时间格式：yyyy-MM-dd */
     @ApiModelProperty(value = "就诊时间")

postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitrecord/PatientVisitRecord.java

@@ -83,7 +83,7 @@ public class PatientVisitRecord extends BaseEntity {
     /** 就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED */
     @ApiModelProperty(value = "就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED")
     @Excel(name = "就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED")
-    private String visitType;
+    private String visitMethod;
 
     /** 就诊时间，格式：yyyy-MM-dd HH:mm:ss */
     @ApiModelProperty(value = "就诊时间，格式：yyyy-MM-dd HH:mm:ss")

postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordDto.java

@@ -1,9 +1,9 @@
 package com.xinelu.manage.dto.patientvisitrecord;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import java.time.LocalDate;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * @description: 患者就诊记录查询传输对象
@@ -21,16 +21,16 @@ public class PatientVisitRecordDto {
 	 * 就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED
 	 */
 	@ApiModelProperty(value = "就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED")
-	private String visitType;
+	private String visitMethod;
 
 	@ApiModelProperty(value = "住院/门诊号")
 	private String inHospitalNumber;
 
 	@ApiModelProperty(value = "就诊时间开始")
-	@JsonFormat(pattern = "yyyy-MM-dd")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
 	private LocalDate visitDateStart;
 
 	@ApiModelProperty(value = "就诊时间结束")
-	@JsonFormat(pattern = "yyyy-MM-dd")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
 	private LocalDate visitDateEnd;
 }

postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordSaveDto.java

@@ -31,7 +31,7 @@ public class PatientVisitRecordSaveDto {
 	 */
 	@ApiModelProperty(value = "就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED")
 	@NotNull(message = "就诊类型不能为空")
-	private String visitType;
+	private String visitMethod;
 
 	/** 主要诊断 */
 	@ApiModelProperty(value = "主要诊断")

postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java

@@ -2,7 +2,7 @@ package com.xinelu.manage.service.patientvisitrecord.impl;
 
 import com.xinelu.common.constant.Constants;
 import com.xinelu.common.constant.NodeTypeConstants;
-import com.xinelu.common.constant.VisitTypeConstants;
+import com.xinelu.common.constant.VisitMethodConstants;
 import com.xinelu.common.core.domain.AjaxResult;
 import com.xinelu.common.exception.ServiceException;
 import com.xinelu.common.utils.SecurityUtils;
@@ -99,15 +99,15 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService
         // 住院时间，出院时间-入院时间
         long daysBetween = ChronoUnit.DAYS.between(saveDto.getAdmissionTime(), saveDto.getDischargeTime());
         patientVisitRecord.setHospitalizationDays((int) daysBetween + 1);
-		if (StringUtils.equals(VisitTypeConstants.OUTPATIENT_SERVICE, saveDto.getVisitType())) {
+		if (StringUtils.equals(VisitMethodConstants.OUTPATIENT_SERVICE, saveDto.getVisitMethod())) {
 			patientVisitRecord.setVisitDate(saveDto.getDischargeTime());
-		} else if (StringUtils.equals(VisitTypeConstants.BE_HOSPITALIZED, saveDto.getVisitType())) {
+		} else if (StringUtils.equals(VisitMethodConstants.BE_HOSPITALIZED, saveDto.getVisitMethod())) {
 			patientVisitRecord.setVisitDate(saveDto.getAdmissionTime());
 		}
 		int flag = patientVisitRecordMapper.insertPatientVisitRecord(patientVisitRecord);
 		if (flag > 0) {
 			// 修改患者信息
-			patientInfo.setVisitMethod(saveDto.getVisitType());
+			patientInfo.setVisitMethod(saveDto.getVisitMethod());
 			patientInfo.setDepartmentId(saveDto.getDepartmentId());
 			patientInfo.setDepartmentName(saveDto.getDepartmentName());
 			patientMapper.updatePatientInfo(patientInfo);
@@ -133,9 +133,9 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService
         // 住院时间，出院时间-入院时间
         long daysBetween = ChronoUnit.DAYS.between(updDto.getAdmissionTime(), updDto.getDischargeTime());
         patientVisitRecord.setHospitalizationDays((int) daysBetween + 1);
-	    if (StringUtils.equals(VisitTypeConstants.OUTPATIENT_SERVICE, updDto.getVisitType())) {
+	    if (StringUtils.equals(VisitMethodConstants.OUTPATIENT_SERVICE, updDto.getVisitMethod())) {
 		    patientVisitRecord.setVisitDate(updDto.getDischargeTime());
-	    } else if (StringUtils.equals(VisitTypeConstants.BE_HOSPITALIZED, updDto.getVisitType())) {
+	    } else if (StringUtils.equals(VisitMethodConstants.BE_HOSPITALIZED, updDto.getVisitMethod())) {
 		    patientVisitRecord.setVisitDate(updDto.getAdmissionTime());
 	    }
 		int flag = patientVisitRecordMapper.updatePatientVisitRecord(patientVisitRecord);
@@ -143,7 +143,7 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService
 		    // 查询患者信息
 		    PatientInfo patientInfo = patientMapper.selectPatientInfoById(updDto.getPatientId());
 		    // 修改患者信息
-		    patientInfo.setVisitMethod(updDto.getVisitType());
+		    patientInfo.setVisitMethod(updDto.getVisitMethod());
 		    patientInfo.setDepartmentId(updDto.getDepartmentId());
 		    patientInfo.setDepartmentName(updDto.getDepartmentName());
 		    patientMapper.updatePatientInfo(patientInfo);
@@ -197,11 +197,11 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService
 				// 在院患者
 				case Constants.IN_HOSPITAL:
 				case Constants.DISCHARGED:
-					patientVisitRecord.setVisitType(VisitTypeConstants.BE_HOSPITALIZED);
+					patientVisitRecord.setVisitMethod(VisitMethodConstants.BE_HOSPITALIZED);
 					break;
 				// 门诊患者
 				case Constants.OUTPATIENT:
-					patientVisitRecord.setVisitType(VisitTypeConstants.OUTPATIENT_SERVICE);
+					patientVisitRecord.setVisitMethod(VisitMethodConstants.OUTPATIENT_SERVICE);
 					patientVisitRecord.setInHospitalNumber(item.getOutpatientNumber());// 门诊、住院号共用一个字段
 					break;
 			}
@@ -279,7 +279,7 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService
 
 			// 根据门诊/住院编号查询是否有记录
 			PatientVisitRecordDto recordQuery = new PatientVisitRecordDto();
-			recordQuery.setVisitType(patientType);
+			recordQuery.setVisitMethod(patientType);
 			recordQuery.setInHospitalNumber(patientVisitRecord.getInHospitalInfo());
 			List<PatientVisitRecord> patientVisitRecordList = patientVisitRecordMapper.selectPatientVisitRecordList(recordQuery);
 			if (CollectionUtils.isEmpty(patientVisitRecordList)) {

postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java

@@ -15,12 +15,12 @@ import com.xinelu.manage.domain.signpatientpackagehardware.SignPatientPackageHar
 import com.xinelu.manage.domain.signpatientrecord.SignPatientRecord;
 import com.xinelu.manage.domain.specialdiseasenode.SpecialDiseaseNode;
 import com.xinelu.manage.domain.specialdiseaseroute.SpecialDiseaseRoute;
+import com.xinelu.manage.domain.specialdiseasetriggercondition.SpecialDiseaseTriggerCondition;
 import com.xinelu.manage.dto.signpatientpackage.SignPatientPackageSaveDto;
 import com.xinelu.manage.dto.signpatientrecord.SignPatientAddDto;
 import com.xinelu.manage.dto.signpatientrecord.SignPatientListDto;
 import com.xinelu.manage.dto.signpatientrecord.SignPatientStatusDto;
 import com.xinelu.manage.mapper.patientinfo.PatientInfoMapper;
-import com.xinelu.manage.mapper.servicepackage.ServicePackageMapper;
 import com.xinelu.manage.mapper.signpatientinformed.SignPatientInformedMapper;
 import com.xinelu.manage.mapper.signpatientmanageroute.SignPatientManageRouteMapper;
 import com.xinelu.manage.mapper.signpatientmanageroutenode.SignPatientManageRouteNodeMapper;
@@ -29,6 +29,7 @@ import com.xinelu.manage.mapper.signpatientpackagehardware.SignPatientPackageHar
 import com.xinelu.manage.mapper.signpatientrecord.SignPatientRecordMapper;
 import com.xinelu.manage.mapper.specialdiseasenode.SpecialDiseaseNodeMapper;
 import com.xinelu.manage.mapper.specialdiseaseroute.SpecialDiseaseRouteMapper;
+import com.xinelu.manage.mapper.specialdiseasetriggercondition.SpecialDiseaseTriggerConditionMapper;
 import com.xinelu.manage.service.signpatientrecord.ISignPatientRecordService;
 import com.xinelu.manage.vo.signpatientrecord.SignPatientInfoVo;
 import com.xinelu.manage.vo.signpatientrecord.SignPatientListVo;
@@ -66,8 +67,6 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService {
 	@Resource
 	private SignPatientInformedMapper signPatientInformedMapper;
 	@Resource
-	private ServicePackageMapper servicePackageMapper;
-	@Resource
 	private SpecialDiseaseRouteMapper specialDiseaseRouteMapper;
 	@Resource
 	private SignPatientManageRouteMapper signPatientManageRouteMapper;
@@ -75,6 +74,8 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService {
 	private SpecialDiseaseNodeMapper specialDiseaseNodeMapper;
 	@Resource
 	private SignPatientManageRouteNodeMapper manageRouteNodeMapper;
+	@Resource
+	private SpecialDiseaseTriggerConditionMapper triggerConditionMapper;
 
 	@Override public List<SignPatientListVo> selectList(SignPatientListDto signPatientRecord) {
 		return signPatientRecordMapper.selectList(signPatientRecord);
@@ -102,15 +103,18 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService {
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public int add(SignPatientAddDto body) {
-		if (ObjectUtils.isEmpty(body.getSignPackage())) {
+		SignPatientPackageSaveDto signPatientPackageDto = body.getSignPackage();
+		if (ObjectUtils.isEmpty(signPatientPackageDto)) {
+			throw new ServiceException("请选择服务包");
+		}
+		if (signPatientPackageDto.getServicePackageId() == null) {
 			throw new ServiceException("请选择服务包");
 		}
-		SignPatientPackageSaveDto signPatientPackageDto = body.getSignPackage();
 		if (ObjectUtils.isNotEmpty(body.getRecord())) {
 			SignPatientRecord signPatientRecord = body.getRecord();
 			signPatientRecord.setId(null);
 			if (signPatientRecord.getPatientId() == null) {
-				throw new ServiceException("数据错误");
+				throw new ServiceException("请选择签约居民");
 			}
 			PatientInfo patient = patientInfoMapper.selectPatientInfoById(signPatientRecord.getPatientId());
 			if (ObjectUtils.isEmpty(patient)) {
@@ -176,6 +180,12 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService {
 					// 批量保存
 					manageRouteNodeMapper.insertBatch(manageNodeList);
 					// 保存触发条件
+					SpecialDiseaseTriggerCondition triggerConditionQuery = new SpecialDiseaseTriggerCondition();
+					triggerConditionQuery.setRouteId(body.getRouteId());
+					List<SpecialDiseaseTriggerCondition> triggerConditions = triggerConditionMapper.selectSpecialDiseaseTriggerConditionList(triggerConditionQuery);
+					//triggerConditions.stream().map(item->{
+					//
+					//})
 				}
 
 				// 保存硬件

postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientrecord/SignPatientInfoVo.java

@@ -64,24 +64,48 @@ public class SignPatientInfoVo {
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private LocalDateTime signTime;
 
+	/**
+	 * 签约时所属医院id
+	 */
+	@ApiModelProperty (value = "签约时所属医院id")
+	private Long hospitalAgencyId;
+
 	/**
 	 * 签约时所属医院名称
 	 */
 	@ApiModelProperty(value = "签约时所属医院名称")
 	private String hospitalAgencyName;
 
+	/**
+	 * 签约时所属院区id
+	 */
+	@ApiModelProperty(value = "签约时所属院区id")
+	private Long campusAgencyId;
+
 	/**
 	 * 签约时所属院区名称
 	 */
 	@ApiModelProperty(value = "签约时所属院区名称")
 	private String campusAgencyName;
 
+	/**
+	 * 签约时所属科室id
+	 */
+	@ApiModelProperty(value = "签约时所属科室id")
+	private Long departmentId;
+
 	/**
 	 * 签约时所属科室名称
 	 */
 	@ApiModelProperty(value = "签约时所属科室名称")
 	private String departmentName;
 
+	/**
+	 * 签约时所属病区id
+	 */
+	@ApiModelProperty(value = "签约时所属病区id")
+	private Long wardId;
+
 	/**
 	 * 签约时所属病区名称
 	 */

postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml

@@ -29,7 +29,6 @@
 		<result property="departmentName" column="department_name" />
 		<result property="wardId" column="ward_id" />
 		<result property="wardName" column="ward_name" />
-		<result property="admissionNumber" column="admission_number" />
 		<result property="responsibleNurse" column="responsible_nurse" />
 		<result property="visitSerialNumber" column="visit_serial_number" />
 		<result property="surgicalName" column="surgical_name" />
@@ -40,7 +39,7 @@
 		<result property="registrationNo" column="registration_no" />
 		<result property="registrationDate" column="registration_date" />
 		<result property="appointmentDate" column="appointment_date" />
-		<result property="outpatientNumber" column="outpatient_number" />
+		<result property="inHospitalNumber" column="in_hospital_number" />
 		<result property="visitTime" column="visit_time" />
 		<result property="dischargeMethod" column="discharge_method" />
 		<result property="openId" column="open_id" />
@@ -67,9 +66,9 @@
 		       sign_time,
 		       certificate_issuing_doctor, visit_method, main_diagnosis, attending_physician,
 		       hospital_agency_id, hospital_agency_name, campus_agency_id, campus_agency_name, department_id, department_name, ward_id, ward_name,
-		       admission_number, responsible_nurse, visit_serial_number, surgical_name,
+		       responsible_nurse, visit_serial_number, surgical_name,
 			   admission_date, discharge_date, medical_record_content, appointment_treatment_group,
-			   registration_no, registration_date, appointment_date, outpatient_number, visit_time, discharge_method,
+			   registration_no, registration_date, appointment_date, in_hospital_number, visit_time, discharge_method,
 			   open_id, union_id, patient_source, del_flag, create_by, create_time, update_by, update_time
 		from patient_info
 	</sql>
@@ -217,9 +216,6 @@
 			<if test="wardId != null">ward_id,
 			</if>
 			<if test="wardName != null">ward_name,
-			</if>
-			<if test="admissionNumber != null">
-		    admission_number,
 			</if>
 			<if test="responsibleNurse != null">
 		    responsible_nurse,
@@ -246,7 +242,7 @@
 			</if>
 			<if test="appointmentDate != null">appointment_date,
 			</if>
-			<if test="outpatientNumber != null">outpatient_number,
+			<if test="inHospitalNumber != null">in_hospital_number,
 			</if>
 			<if test="visitTime != null">visit_time,
 			</if>
@@ -318,8 +314,6 @@
 			</if>
 			<if test="wardName != null">#{wardName},
 			</if>
-			<if test="admissionNumber != null">#{admissionNumber},
-			</if>
 			<if test="responsibleNurse != null">#{responsibleNurse},
 			</if>
 			<if test="visitSerialNumber != null">#{visitSerialNumber},
@@ -340,7 +334,7 @@
 			</if>
 			<if test="appointmentDate != null">#{appointmentDate},
 			</if>
-			<if test="outpatientNumber != null">#{outpatientNumber},
+			<if test="inHospitalNumber != null">#{inHospitalNumber},
 			</if>
 			<if test="visitTime != null">#{visitTime},
 			</if>
@@ -438,9 +432,6 @@
 			<if test="wardName != null">ward_name =
 				#{wardName},
 			</if>
-			<if test="admissionNumber != null">admission_number =
-				#{admissionNumber},
-			</if>
 			<if test="responsibleNurse != null">responsible_nurse =
 				#{responsibleNurse},
 			</if>
@@ -471,8 +462,8 @@
 			<if test="appointmentDate != null">appointment_date =
 				#{appointmentDate},
 			</if>
-			<if test="outpatientNumber != null">outpatient_number =
+			<if test="inHospitalNumber != null">in_hospital_number =
-				#{outpatientNumber},
+				#{inHospitalNumber},
 			</if>
 			<if test="visitTime != null">visit_time =
 				#{visitTime},

postdischarge-manage/src/main/resources/mapper/manage/patientvisitrecord/PatientVisitRecordMapper.xml

@@ -16,7 +16,7 @@
 	    <result property="birthDate" column="birth_date"/>
 	    <result property="age" column="age"/>
 	    <result property="nation" column="nation"/>
-	    <result property="visitType" column="visit_type"/>
+	    <result property="visitMethod" column="visit_method"/>
 	    <result property="visitDate" column="visit_date"/>
 	    <result property="visitName" column="visit_name"/>
 	    <result property="hospitalAgencyId" column="hospital_agency_id"/>
@@ -59,8 +59,8 @@
 	        <if test="patientId != null ">
 		        and patient_id = #{patientId}
 	        </if>
-	        <if test="visitType != null ">
+	        <if test="visitMethod != null ">
-		        and visit_type = #{visitType}
+		        and visit_method = #{visitMethod}
 	        </if>
 	        <if test="inHospitalNumber != null ">
 		        and in_hospital_number = #{inHospitalNumber}
@@ -105,7 +105,7 @@
 			</if>
 			<if test="nation != null">nation,
 			</if>
-			<if test="visitType != null">visit_type,
+			<if test="visitMethod != null">visit_method,
 			</if>
 			<if test="visitDate != null">visit_date,
 			</if>
@@ -189,7 +189,7 @@
 			</if>
 			<if test="nation != null">#{nation},
 			</if>
-			<if test="visitType != null">#{visitType},
+			<if test="visitMethod != null">#{visitMethod},
 			</if>
 			<if test="visitDate != null">#{visitDate},
 			</if>
@@ -287,8 +287,8 @@
 			<if test="nation != null">nation =
 				#{nation},
 			</if>
-			<if test="visitType != null">visit_type =
+			<if test="visitMethod != null">visit_method =
-				#{visitType},
+				#{visitMethod},
 			</if>
 			<if test="visitDate != null">visit_date =
 				#{visitDate},
@@ -414,7 +414,7 @@
 			(#{item.patientId,jdbcType=NUMERIC},#{item.cardNo,jdbcType=VARCHAR},
 			#{item.patientName,jdbcType=VARCHAR},#{item.patientPhone,jdbcType=VARCHAR},#{item.familyMemberPhone,jdbcType=VARCHAR},
 			#{item.address,jdbcType=VARCHAR},#{item.sex,jdbcType=VARCHAR},#{item.birthDate,jdbcType=TIMESTAMP},
-			#{item.age,jdbcType=NUMERIC},#{item.nation,jdbcType=VARCHAR},#{item.visitType,jdbcType=VARCHAR},
+			#{item.age,jdbcType=NUMERIC},#{item.nation,jdbcType=VARCHAR},#{item.visitMethod,jdbcType=VARCHAR},
 			#{item.visitDate,jdbcType=TIMESTAMP},#{item.visitName,jdbcType=VARCHAR},#{item.hospitalAgencyId,jdbcType=NUMERIC},
 			#{item.hospitalAgencyName,jdbcType=VARCHAR},#{item.campusAgencyId,jdbcType=NUMERIC},#{item.campusAgencyName,jdbcType=VARCHAR},
 			#{item.departmentId,jdbcType=NUMERIC},#{item.departmentName,jdbcType=VARCHAR},#{item.wardId,jdbcType=NUMERIC},

postdischarge-manage/src/main/resources/mapper/manage/signpatientrecord/SignPatientRecordMapper.xml

@@ -398,10 +398,11 @@
 		select
 		sign.id,sign.patient_id,sign.patient_name,
 		sign.patient_phone,sign.card_no,sign.sex, sign.birth_date,sign.sign_time,
-		sign.hospital_agency_id,sign.hospital_agency_name,
+		sign.hospital_agency_id, sign.hospital_agency_name,
-		sign.campus_agency_name,sign.department_name,
+		sign.campus_agency_id, sign.campus_agency_name,
-		sign.ward_name,sign.visit_serial_number,
+		sign.department_id, sign.department_name,
-		sign.visit_method,sign.in_hospital_number,sign.sign_diagnosis,sign.review_diagnosis,
+		sign.ward_id, sign.ward_name,
+		sign.visit_serial_number, sign.visit_method,sign.in_hospital_number,sign.sign_diagnosis,sign.review_diagnosis,
 		sign.service_status,sign.sign_status,sign.payment_status,sign.price,sign.health_manage_id,sign.health_manage_name,
 		p.service_package_id, p.package_name, p.package_payment_status, p.package_price, p.service_start_time, p.service_end_time,
 		p.package_term, p.package_term_unit, route.route_id, route.route_name