修改字段名。

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

@@ -15,5 +15,5 @@ public class VisitMethodConstants {
 	/**
 	 * 住院
 	 */
-	public static final String BE_HOSPITALIZED = "BE_HOSPITALIZED";
+	public static final String BE_IN_HOSPITAL = "BE_IN_HOSPITAL";
 }

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

@@ -162,11 +162,11 @@ public class PatientInfo extends BaseEntity {
 
     /** 入院时间，时间格式：yyyy-MM-dd */
     @ApiModelProperty(value = "入院时间")
-    private LocalDate admissionDate;
+    private LocalDateTime admissionTime;
 
     /** 出院时间（出院患者），时间格式：yyyy-MM-dd */
     @ApiModelProperty(value = "出院时间（出院患者）")
-    private LocalDate dischargeDate;
+    private LocalDateTime dischargeTime;
 
     /** 预约治疗组（取值以及枚举未知？） */
     @ApiModelProperty(value = "预约治疗组（取值以及枚举未知？）")

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

@@ -11,6 +11,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 患者就诊记录基本信息对象 patient_visit_record
@@ -84,9 +85,9 @@ public class PatientVisitRecord extends BaseEntity {
     @Excel(name = "民族")
     private String nation;
 
-    /** 就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED */
+    /** 就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL */
-    @ApiModelProperty(value = "就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED")
+    @ApiModelProperty(value = "就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL")
-    @Excel(name = "就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED")
+    @Excel(name = "就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL")
     private String visitMethod;
 
     /** 就诊时间，格式：yyyy-MM-dd HH:mm:ss */
@@ -168,18 +169,20 @@ public class PatientVisitRecord extends BaseEntity {
     /** 入院时间 */
     @ApiModelProperty(value = "入院时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     @Excel(name = "入院时间", width = 30, dateFormat = "yyyy-MM-dd")
     private LocalDateTime admissionTime;
 
     /** 出院时间 */
     @ApiModelProperty(value = "出院时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     @Excel(name = "出院时间", width = 30, dateFormat = "yyyy-MM-dd")
     private LocalDateTime dischargeTime;
 
     /** _记录时间（入院记录） */
     @ApiModelProperty(value = "_记录时间")
-    @Excel(name = "_记录时间", readConverterExp = "入=院记录")
+    @Excel(name = "_记录时间", readConverterExp = "入院记录")
     private LocalDateTime recordTime;
 
     /** 门诊记录信息（就诊记录-门诊记录） */

postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientinfo/PatientInfoDto.java

@@ -64,19 +64,19 @@ public class PatientInfoDto {
 
 	/** 就诊时间开始（门诊患者），时间格式：yyyy-MM-dd */
 	@ApiModelProperty(value = "就诊时间开始")
-	private LocalDate visitTimeStart;
+	private LocalDate visitDateStart;
 
 	/** 就诊时间结束（门诊患者），时间格式：yyyy-MM-dd */
 	@ApiModelProperty(value = "就诊时间结束")
-	private LocalDate visitTimeEnd;
+	private LocalDate visitDateEnd;
 
 	/** 入院时间开始，时间格式：yyyy-MM-dd */
 	@ApiModelProperty(value = "入院时间开始")
-	private LocalDate admissionDateStart;
+	private LocalDate admissionTimeStart;
 
 	/** 入院时间结束，时间格式：yyyy-MM-dd */
 	@ApiModelProperty(value = "入院时间结束")
-	private LocalDate admissionDateEnd;
+	private LocalDate admissionTimeEnd;
 
 	/** 预约时间开始（预住院患者），时间格式：yyyy-MM-dd */
 	@ApiModelProperty(value = "预约时间开始（预住院患者），时间格式：yyyy-MM-dd")

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

@@ -28,9 +28,9 @@ public class PatientVisitRecordDto {
 	private Long hospitalAgencyId;
 
 	/**
-	 * 就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED
+	 * 就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL
 	 */
-	@ApiModelProperty(value = "就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED")
+	@ApiModelProperty(value = "就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL")
 	private String visitMethod;
 
 	@ApiModelProperty(value = "住院/门诊号")

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

@@ -5,6 +5,7 @@ import com.xinelu.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import lombok.Data;
 
 /**
@@ -35,12 +36,12 @@ public class PatientVisitRecordImportDto {
 	/** 入院时间，时间格式：yyyy-MM-dd */
 	@ApiModelProperty(value = "入院时间")
 	@Excel(name = "入院时间")
-	private LocalDate admissionDate;
+	private LocalDateTime admissionTime;
 
 	/** 出院时间 */
 	@ApiModelProperty(value = "出院时间")
 	@Excel(name = "出院时间")
-	private LocalDate dischargeTime;
+	private LocalDateTime dischargeTime;
 
 	/** 身份证号 */
 	@ApiModelProperty(value = "身份证号")

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

@@ -27,9 +27,9 @@ public class PatientVisitRecordInfoSaveDto {
 	private Long patientId;
 
 	/**
-	 * 就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED
+	 * 就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL
 	 */
-	@ApiModelProperty(value = "就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED")
+	@ApiModelProperty(value = "就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL")
 	@NotNull(message = "就诊类型不能为空")
 	private String visitMethod;
 
@@ -94,13 +94,13 @@ public class PatientVisitRecordInfoSaveDto {
 	/** 入院时间 */
 	@ApiModelProperty(value = "入院时间")
 	@NotNull(message = "入院时间不能为空")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
 	private LocalDateTime admissionTime;
 
 	/** 出院时间 */
 	@ApiModelProperty(value = "出院时间")
 	@NotNull(message = "出院时间不能为空")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
 	private LocalDateTime dischargeTime;
 
 	@ApiModelProperty(value = "住院/门诊号")

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

@@ -53,8 +53,8 @@ public class PatientVisitRecordSaveDto {
 	@JsonFormat(pattern = "yyyy-MM-dd")
 	private LocalDate birthDate;
 
-	/** 就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED */
+	/** 就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL */
-	@ApiModelProperty(value = "就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED")
+	@ApiModelProperty(value = "就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL")
 	@NotNull(message = "就诊类型不能为空")
 	private String visitMethod;
 

postdischarge-manage/src/main/java/com/xinelu/manage/dto/propagandainfo/PropagandaInfoSaveDto.java

@@ -15,6 +15,11 @@ import lombok.Data;
 @ApiModel("宣教库保存传输对象")
 @Data
 public class PropagandaInfoSaveDto {
+
+	/** 主键id */
+	@ApiModelProperty("主键id")
+	private Long id;
+
 	/** 所属医院id */
 	@ApiModelProperty(value = "所属医院id")
 	private Long hospitalAgencyId;

postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java

@@ -98,14 +98,34 @@ public class PatientInfoServiceImpl implements IPatientInfoService {
      */
     @Override
     public int updatePatientInfo(PatientInfo patientInfo) {
+	    ResidentInfo residentInfo = new ResidentInfo();
+		if (patientInfo.getResidentId() != null) {
+			residentInfo = residentInfoMapper.selectResidentInfoById(patientInfo.getResidentId());
+			BeanUtils.copyBeanProp(residentInfo, patientInfo);
+			residentInfo.setId(patientInfo.getResidentId());
+			residentInfoMapper.updateResidentInfo(residentInfo);
+		} else {
+			// 根据身份证号查询是否有该居民
+			ResidentInfo residentQuery = new ResidentInfo();
+			residentQuery.setCardNo(patientInfo.getCardNo());
+			List<ResidentInfo> residentList = residentInfoMapper.selectResidentInfoList(residentQuery);
+			if (CollectionUtils.isNotEmpty(residentList)) {
+				Long residentId = residentList.get(0).getId();
+				residentInfo = residentList.get(0);
+				BeanUtils.copyBeanProp(residentInfo, patientInfo);
+				residentInfo.setId(residentId);
+				residentInfoMapper.updateResidentInfo(residentInfo);
+			} else {
+				BeanUtils.copyBeanProp(residentInfo, patientInfo);
+				residentInfo.setId(null);
+				residentInfoMapper.insertResidentInfo(residentInfo);
+			}
+			patientInfo.setResidentId(residentInfo.getId());
+		}
 	    patientInfo.setUpdateBy(SecurityUtils.getLoginUser().getUser().getNickName());
-        patientInfo.setUpdateTime(LocalDateTime.now());
+	    patientInfo.setUpdateTime(LocalDateTime.now());
 	    patientInfo.setDelFlag(0);
-	    patientInfoMapper.updatePatientInfo(patientInfo);
+        return patientInfoMapper.updatePatientInfo(patientInfo);
-		ResidentInfo residentInfo = residentInfoMapper.selectResidentInfoById(patientInfo.getResidentId());
-		BeanUtils.copyBeanProp(residentInfo, patientInfo);
-	    residentInfo.setId(patientInfo.getResidentId());
-        return residentInfoMapper.updateResidentInfo(residentInfo);
     }
 
     /**
@@ -147,8 +167,8 @@ public class PatientInfoServiceImpl implements IPatientInfoService {
 		patientInfo.setPatientType(null);
 		patientInfo.setPatientVisitRecordId(null);
 		patientInfo.setVisitMethod(null);
-		patientInfo.setAdmissionDate(null);
+		patientInfo.setAdmissionTime(null);
-		patientInfo.setDischargeDate(null);
+		patientInfo.setDischargeTime(null);
 		patientInfo.setAttendingPhysicianId(null);
 		patientInfo.setAttendingPhysicianName(null);
 		patientInfo.setResponsibleNurse(null);

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

@@ -58,8 +58,6 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService
 	@Resource
 	private DepartmentMapper departmentMapper;
 	@Resource
-	private PatientInfoMapper patientInfoMapper;
-	@Resource
 	private IPatientInfoService patientInfoService;
 
 	/**
@@ -105,7 +103,7 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService
 	    PatientInfoDto patientInfoDto = new PatientInfoDto();
 		patientInfoDto.setHospitalAgencyId(saveBody.getHospitalAgencyId());
 		patientInfoDto.setCardNo(saveBody.getCardNo());
-	    List<PatientInfo> patientInfoList = patientInfoMapper.selectPatientInfoList(patientInfoDto);
+	    List<PatientInfo> patientInfoList = patientInfoService.selectPatientInfoList(patientInfoDto);
 		// 患者档案信息新增/修改
 	    PatientInfo patientInfo = new PatientInfo();
 	    if(CollectionUtils.isEmpty(patientInfoList)) {
@@ -133,7 +131,7 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService
 		// 修改患者最近一次就诊记录id
 		patientInfo.setPatientVisitRecordId(recordId);
 	    patientInfo.setVisitDate(saveBody.getVisitDate());
-		patientInfoMapper.updatePatientInfo(patientInfo);
+	    patientInfoService.updatePatientInfo(patientInfo);
     }
 
 	private Long saveOrUpate(PatientVisitRecord patientVisitRecord) {
@@ -144,6 +142,7 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService
 		if (CollectionUtils.isEmpty(patientVisitRecordList)) {
 			patientVisitRecord.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName());
 			patientVisitRecord.setCreateTime(LocalDateTime.now());
+			patientVisitRecord.setDelFlag(0);
 			patientVisitRecordMapper.insertPatientVisitRecord(patientVisitRecord);
 		} else {
 			patientVisitRecord.setId(patientVisitRecordList.get(0).getId());
@@ -168,6 +167,7 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService
 		BeanUtils.copyBeanProp(patientInfo, patientVisitRecord);
 		patientInfoService.updatePatientInfo(patientInfo);
 		// 修改就诊记录信息
+		patientVisitRecord.setResidentId(patientInfo.getResidentId());
 		return patientVisitRecordMapper.updatePatientVisitRecord(patientVisitRecord);
 	}
 
@@ -184,6 +184,7 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService
 			throw new ServiceException("门诊/住院号重复，请确认后重新输入!");
 		}
         BeanUtils.copyBeanProp(patientVisitRecord, saveDto);
+		patientVisitRecord.setDelFlag(0);
         patientVisitRecord.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName());
         patientVisitRecord.setCreateTime(LocalDateTime.now());
         setVisitDate(patientVisitRecord);
@@ -280,7 +281,7 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService
 				// 在院患者
 				case Constants.IN_HOSPITAL:
 				case Constants.DISCHARGED:
-					patientVisitRecord.setVisitMethod(VisitMethodConstants.BE_HOSPITALIZED);
+					patientVisitRecord.setVisitMethod(VisitMethodConstants.BE_IN_HOSPITAL);
 					break;
 				// 门诊患者
 				case Constants.OUTPATIENT:
@@ -359,7 +360,7 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService
 				patientMapper.insertPatientInfo(saveInfo);
 				patientVisitRecord.setPatientId(saveInfo.getId());
 			}
-
+			patientVisitRecord.setDelFlag(0);
 			// 根据门诊/住院编号查询是否有记录
 			PatientVisitRecordDto recordQuery = new PatientVisitRecordDto();
 			recordQuery.setVisitMethod(patientType);
@@ -386,7 +387,7 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService
 
 	@Override
 	public void setPatientType(PatientInfo patientInfo, PatientVisitRecord patientVisitRecord) {
-		if (StringUtils.equals(VisitMethodConstants.BE_HOSPITALIZED, patientVisitRecord.getVisitMethod())) {
+		if (StringUtils.equals(VisitMethodConstants.BE_IN_HOSPITAL, patientVisitRecord.getVisitMethod())) {
 			// 住院患者：有出院时间，设置患者类型为出院，没有出院时间，设置患者类型为在院
 			if (patientVisitRecord.getDischargeTime() == null) {
 				patientInfo.setPatientType(PatientTypeConstants.IN_HOSPITAL_PATIENT);
@@ -405,10 +406,12 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService
 	private void setVisitDate(PatientVisitRecord patientVisitRecord) {
 		if (StringUtils.equals(VisitMethodConstants.OUTPATIENT_SERVICE, patientVisitRecord.getVisitMethod())) {
 			patientVisitRecord.setVisitDate(patientVisitRecord.getDischargeTime());
-		} else if (StringUtils.equals(VisitMethodConstants.BE_HOSPITALIZED, patientVisitRecord.getVisitMethod())) {
+		} else if (StringUtils.equals(VisitMethodConstants.BE_IN_HOSPITAL, patientVisitRecord.getVisitMethod())) {
 			// 住院时间，出院时间-入院时间
-			long daysBetween = ChronoUnit.DAYS.between(patientVisitRecord.getAdmissionTime(), patientVisitRecord.getDischargeTime());
+			if (patientVisitRecord.getDischargeTime() != null) {
-			patientVisitRecord.setHospitalizationDays((int) daysBetween + 1);
+				long daysBetween = ChronoUnit.DAYS.between(patientVisitRecord.getAdmissionTime(), patientVisitRecord.getDischargeTime());
+				patientVisitRecord.setHospitalizationDays((int) daysBetween + 1);
+			}
 			patientVisitRecord.setVisitDate(patientVisitRecord.getAdmissionTime());
 		}
 	}

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

@@ -275,6 +275,7 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService {
 		signRecord.setPatientId(patientInfo.getId());
 		signRecord.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName());
 		signRecord.setCreateTime(LocalDateTime.now());
+		signRecord.setId(null);
 		int flag = signPatientRecordMapper.insertSelective(signRecord);
 		if (flag > 0) {
 			patientInfo.setSignPatientRecordId(signRecord.getId());

postdischarge-manage/src/main/java/com/xinelu/manage/vo/patienttaskexecuterecord/PatientTaskExecuteRecordVO.java

@@ -3,11 +3,11 @@ package com.xinelu.manage.vo.patienttaskexecuterecord;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xinelu.manage.domain.patienttaskexecuterecord.PatientTaskExecuteRecord;
 import io.swagger.annotations.ApiModelProperty;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.time.LocalDate;
-
 
 /**
  * 患者管理任务执行记录对象 patient_task_execute_record
@@ -60,11 +60,11 @@ public class PatientTaskExecuteRecordVO extends PatientTaskExecuteRecord {
 
     @ApiModelProperty(value = "入院时间")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDate admissionDate;
+    private LocalDateTime admissionTime;
 
     @JsonFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "出院时间（出院患者）")
-    private LocalDate dischargeDate;
+    private LocalDateTime dischargeTime;
 
     @ApiModelProperty(value = "就诊方式，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL")
     private String visitMethod;

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

@@ -33,8 +33,8 @@
 		<result property="responsibleNurse" column="responsible_nurse" />
 		<result property="patientVisitRecordId" column="patient_visit_record_id" />
 		<result property="visitSerialNumber" column="visit_serial_number" />
-		<result property="admissionDate" column="admission_date" />
+		<result property="admissionTime" column="admission_time" />
-		<result property="dischargeDate" column="discharge_date" />
+		<result property="dischargeTime" column="discharge_time" />
 		<result property="appointmentTreatmentGroup" column="appointment_treatment_group" />
 		<result property="registrationNo" column="registration_no" />
 		<result property="registrationDate" column="registration_date" />
@@ -65,7 +65,7 @@
 		       visit_method, attending_physician_id, attending_physician_name, main_diagnosis,
 		       hospital_agency_id, hospital_agency_name, campus_agency_id, campus_agency_name, department_id, department_name, ward_id, ward_name,
 		       responsible_nurse, patient_visit_record_id, visit_serial_number,
-			   admission_date, discharge_date, appointment_treatment_group,
+			   admission_time, discharge_time, appointment_treatment_group,
 			   registration_no, registration_date, appointment_date, in_hospital_number, visit_date, discharge_method,
 			   patient_source, del_flag, create_by, create_time, update_by, update_time
 		from patient_info
@@ -115,17 +115,17 @@
 			<if test="visitMethod != null  and visitMethod != ''">
 				and visit_method = #{visitMethod}
 			</if>
-			<if test="visitTimeStart != null ">
+			<if test="visitDateStart != null ">
-				and visit_date >= #{visitTimeStart}
+				and visit_date >= #{visitDateStart}
 			</if>
-			<if test="visitTimeEnd != null ">
+			<if test="visitDateEnd != null ">
-				and visit_date &lt;= #{visitTimeEnd}
+				and visit_date &lt;= #{visitDateEnd}
 			</if>
-			<if test="admissionDateStart != null ">
+			<if test="admissionTimeStart != null ">
-				and admission_date >= #{admissionDateStart}
+				and admission_time >= #{admissionTimeStart}
 			</if>
-			<if test="admissionDateEnd != null ">
+			<if test="admissionTimeEnd != null ">
-				and admission_date &lt;= #{admissionDateEnd}
+				and admission_time &lt;= #{admissionTimeEnd}
 			</if>
 			<if test="appointmentDateStart != null ">
 				and appointment_date >= #{appointmentDateStart}
@@ -227,11 +227,11 @@
 			<if test="visitSerialNumber != null">
 		    visit_serial_number,
 			</if>
-			<if test="admissionDate != null">
+			<if test="admissionTime != null">
-				admission_date,
+				admission_time,
 			</if>
-			<if test="dischargeDate != null">
+			<if test="dischargeTime != null">
-				discharge_date,
+				discharge_time,
 			</if>
 			<if test="appointmentTreatmentGroup != null">appointment_treatment_group,
 			</if>
@@ -317,9 +317,9 @@
 			</if>
 			<if test="visitSerialNumber != null">#{visitSerialNumber},
 			</if>
-			<if test="admissionDate != null">#{admissionDate},
+			<if test="admissionTime != null">#{admissionTime},
 			</if>
-			<if test="dischargeDate != null">#{dischargeDate},
+			<if test="dischargeTime != null">#{dischargeTime},
 			</if>
 			<if test="appointmentTreatmentGroup != null">#{appointmentTreatmentGroup},
 			</if>
@@ -435,11 +435,11 @@
 			<if test="visitSerialNumber != null">visit_serial_number =
 				#{visitSerialNumber},
 			</if>
-			<if test="admissionDate != null">
+			<if test="admissionTime != null">
-				admission_date = #{admissionDate},
+				admission_time = #{admissionTime},
 			</if>
-			<if test="dischargeDate != null">
+			<if test="dischargeTime != null">
-				discharge_date = #{dischargeDate},
+				discharge_time = #{dischargeTime},
 			</if>
 			<if test="appointmentTreatmentGroup != null">appointment_treatment_group =
 				#{appointmentTreatmentGroup},