预住院、在院患者状态流转。

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

@@ -38,6 +38,10 @@ public class PatientVisitRecord extends BaseEntity {
     @Excel(name = "患者表id")
     private Long patientId;
 
+	@ApiModelProperty(value = "预住院患者表id")
+	@Excel(name = "预住院患者表id")
+	private Long patientPreHospitalizationId;
+
     /** 身份证号 */
     @ApiModelProperty(value = "身份证号")
     @Excel(name = "身份证号")

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

@@ -26,6 +26,9 @@ public class PatientVisitRecordInfoSaveDto {
 	@NotNull(message = "患者数据不能为空")
 	private Long patientId;
 
+	@ApiModelProperty(value = "预住院患者表id")
+	private Long patientPreHospitalizationId;
+
 	/**
 	 * 就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL
 	 */
@@ -99,11 +102,11 @@ public class PatientVisitRecordInfoSaveDto {
 
 	/** 出院时间 */
 	@ApiModelProperty(value = "出院时间")
-	@NotNull(message = "出院时间不能为空")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
 	private LocalDateTime dischargeTime;
 
 	@ApiModelProperty(value = "住院/门诊号")
+	@NotNull(message = "住院/门诊号不能为空")
 	private String inHospitalNumber;
 
 	/** 入院病历信息，存储患者入院的整个病历信息 */
@@ -117,12 +120,10 @@ public class PatientVisitRecordInfoSaveDto {
 
 	/** 手术名称 */
 	@ApiModelProperty(value = "手术名称")
-	@Excel(name = "手术名称")
 	private String surgicalName;
 
 	/** 手术记录 */
 	@ApiModelProperty(value = "手术记录")
-	@Excel(name = "手术记录")
 	private String surgicalRecord;
 
 }

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

@@ -236,7 +236,7 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService
 			PatientInfo patientInfo = patientMapper.selectPatientInfoById(saveDto.getPatientId());
 			BeanUtils.copyBeanProp(patientInfo, patientVisitRecord);
 			patientInfo.setId(saveDto.getPatientId());
-			patientInfo.setPatientPreHospitalizationId(null);
+			//patientInfo.setPatientPreHospitalizationId(null);
 			// 设置患者类型
 			setPatientType(patientInfo, patientVisitRecord);
 			patientInfo.setPatientVisitRecordId(patientVisitRecord.getId());

postdischarge-manage/src/main/resources/mapper/manage/patientprehospitalization/PatientPreHospitalizationMapper.xml

@@ -292,10 +292,10 @@
 		patient.patient_phone,patient.card_no,patient.sex,
 		patient.birth_date,patient.family_member_phone,patient.address,
 		p.main_diagnosis,p.hospital_agency_id,p.hospital_agency_name,
-		p.campus_agency_name,
+		p.campus_agency_id,p.campus_agency_name,
-		p.department_name,p.ward_name,
+		p.department_id,p.department_name,p.ward_id,p.ward_name,
 		p.appointment_treatment_group,p.registration_no,p.registration_date,
-		p.appointment_date, p.certificate_issuing_doctor_id,p.certificate_issuing_doctor_name, patient.create_time
+		p.appointment_date, p.certificate_issuing_doctor_id,p.certificate_issuing_doctor_name, p.responsible_nurse,patient.create_time
 		from patient_info patient left join patient_pre_hospitalization p on p.patient_id = patient.id
 		<where>
 			p.del_flag = 0 and patient.patient_type = 'PRE_HOSPITALIZED_PATIENT'

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

@@ -8,6 +8,7 @@
 	    <result property="id" column="id"/>
 	    <result property="residentId" column="resident_id"/>
 	    <result property="patientId" column="patient_id"/>
+	    <result property="patientPreHospitalizationId" column="patient_pre_hospitalization_id"/>
 	    <result property="cardNo" column="card_no"/>
 	    <result property="patientName" column="patient_name"/>
 	    <result property="patientPhone" column="patient_phone"/>
@@ -117,6 +118,8 @@
 			</if>
 			<if test="patientId != null">patient_id,
 			</if>
+			<if test="patientPreHospitalizationId != null">patient_pre_hospitalization_id,
+			</if>
 			<if test="cardNo != null">card_no,
 			</if>
 			<if test="patientName != null">patient_name,
@@ -207,6 +210,8 @@
 			</if>
 			<if test="patientId != null">#{patientId},
 			</if>
+			<if test="patientPreHospitalizationId != null">#{patientPreHospitalizationId},
+			</if>
 			<if test="cardNo != null">#{cardNo},
 			</if>
 			<if test="patientName != null">#{patientName},