diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java
index e6cf4157..463e18dc 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java
@@ -10,8 +10,8 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
-import java.time.LocalDateTime;
import java.time.LocalDate;
+import java.time.LocalDateTime;
/**
* 患者信息对象 patient_info
@@ -33,9 +33,6 @@ public class PatientInfo extends BaseEntity {
*/
private Long id;
- /**
- * 患者姓名
- */
/**
* 居民信息表id
*/
@@ -119,9 +116,6 @@ public class PatientInfo extends BaseEntity {
@Excel(name = "签约时间,格式:yyyy-MM-dd HH:mm:ss", width = 30, dateFormat = "yyyy-MM-dd")
private LocalDateTime signTime;
- /**
- * 就诊方式,门诊:OUTPATIENT_SERVICE,住院:BE_IN_HOSPITAL
- */
/**
* 开证医生(预住院患者)
*/
@@ -150,9 +144,6 @@ public class PatientInfo extends BaseEntity {
@Excel(name = "主治医生姓名")
private String attendingPhysicianName;
- /**
- * 主要诊断
- */
/**
* 主要诊断
*/
@@ -166,9 +157,6 @@ public class PatientInfo extends BaseEntity {
@Excel(name = "主治医生")
private String attendingPhysician;
- /**
- * 所属医院id
- */
/**
* 所属医院id
*/
@@ -221,9 +209,6 @@ public class PatientInfo extends BaseEntity {
@Excel(name = "所属病区名称")
private String wardName;
- /**
- * 责任护士
- */
/**
* 住院号
*/
@@ -243,9 +228,6 @@ public class PatientInfo extends BaseEntity {
@ApiModelProperty(value = "最新一条就诊记录id")
private Long patientVisitRecordId;
- /**
- * 就诊流水号
- */
/**
* 就诊流水号
*/
@@ -258,9 +240,6 @@ public class PatientInfo extends BaseEntity {
@ApiModelProperty(value = "手术名称")
private String surgicalName;
- /**
- * 入院时间,时间格式:yyyy-MM-dd
- */
/**
* 入院时间,时间格式:yyyy-MM-dd
*/
@@ -273,9 +252,6 @@ public class PatientInfo extends BaseEntity {
@ApiModelProperty(value = "出院时间(出院患者)")
private LocalDateTime dischargeTime;
- /**
- * 预约治疗组(取值以及枚举未知?)
- */
/**
* 病历内容
*/
@@ -312,6 +288,7 @@ public class PatientInfo extends BaseEntity {
@ApiModelProperty(value = "门诊/住院号 ")
@Excel(name = "门诊/住院号 ", readConverterExp = "门诊/住院号 ")
private String inHospitalNumber;
+
/**
* 门诊号(门诊患者)
*/
@@ -323,13 +300,15 @@ public class PatientInfo extends BaseEntity {
* 就诊时间,格式:yyyy-MM-dd HH:mm:ss
*/
@ApiModelProperty(value = "就诊时间,格式:yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "就诊时间,格式:yyyy-MM-dd HH:mm:ss", width = 30, dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "就诊时间,格式:yyyy-MM-dd HH:mm:ss", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime visitDate;
+
/**
* 就诊时间(门诊患者),时间格式:yyyy-MM-dd
*/
@ApiModelProperty(value = "就诊时间")
+ @JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "就诊时间", readConverterExp = "门=诊患者")
private LocalDate visitTime;
@@ -340,9 +319,6 @@ public class PatientInfo extends BaseEntity {
@Excel(name = "出院方式", readConverterExp = "出=院患者")
private String dischargeMethod;
- /**
- * 患者来源,微信小程序:WE_CHAT_APPLET,微信公众号:WE_CHAT_OFFICIAL_ACCOUNT,管理端:MANAGE_END
- */
/**
* 微信小程序openid,微信小程序唯一标识
*/
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientinfo/PatientInfoMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientinfo/PatientInfoMapper.java
index 632f27e0..5fc4e354 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientinfo/PatientInfoMapper.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientinfo/PatientInfoMapper.java
@@ -19,7 +19,7 @@ public interface PatientInfoMapper {
* @param id 患者信息主键
* @return 患者信息
*/
- public PatientInfo selectPatientInfoById(Long id);
+ PatientInfo selectPatientInfoById(Long id);
/**
* 查询患者信息
@@ -27,7 +27,7 @@ public interface PatientInfoMapper {
* @param id 主键id
* @return 患者信息
*/
- public PatientBaseInfoVo getPatientBaseInfo(Long id);
+ PatientBaseInfoVo getPatientBaseInfo(Long id);
/**
* 查询患者信息列表
@@ -59,7 +59,7 @@ public interface PatientInfoMapper {
* @param id 患者信息主键
* @return 结果
*/
- public int deletePatientInfoById(Long id);
+ int deletePatientInfoById(Long id);
/**
* 批量删除患者信息
@@ -67,7 +67,7 @@ public interface PatientInfoMapper {
* @param ids 需要删除的数据主键集合
* @return 结果
*/
- public int deletePatientInfoByIds(Long[] ids);
+ int deletePatientInfoByIds(Long[] ids);
/**
* 根据openid查询被护理人信息
diff --git a/postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml
index ac12a2c5..3aff95f4 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml
@@ -49,61 +49,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
select id,resident_id,
-
- select id,
patient_name,
patient_phone,
family_member_phone,
@@ -120,10 +68,6 @@
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
- admission_number, 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,
- open_id, union_id, official_account_openid, patient_source, del_flag, create_by, create_time, update_by, update_time
from patient_info
@@ -207,93 +151,6 @@
-
-
-
- insert into patient_info
-
-
- patient_name,
-
- patient_phone,
-
- family_member_phone,
-
- birth_date,
-
- card_no,
-
- sex,
-
- address,
-
- patient_type,
-
- sign_status,
-
- sign_patient_record_id,
-
- service_status,
-
- 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,
-
-
- admission_date,
-
-
- discharge_date,
-
- medical_record_content,
-
- appointment_treatment_group,
-
- registration_no,
-
- registration_date,
-
- appointment_date,
-
- outpatient_number,
-
- visit_time,
-
- discharge_method,
-
- open_id,
-
- union_id,
-
- official_account_openid,
-
- patient_source,
-
- del_flag,
-
- create_by,
-
- create_time,
-
- update_by,
-
- update_time,
-
-
-
- #{patientName},
-
- #{patientPhone},
-
- #{familyMemberPhone},
-
- #{birthDate},
-
- #{cardNo},
-
- #{sex},
-
- #{address},
-
- #{patientType},
-
- #{signStatus},
-
- #{signPatientRecordId},
-
- #{serviceStatus},
-
- #{signTime},
-
- #{certificateIssuingDoctor},
-
- #{visitMethod},
-
- #{mainDiagnosis},
-
- #{attendingPhysician},
-
- #{hospitalAgencyId},
-
- #{hospitalAgencyName},
-
- #{campusAgencyId},
-
- #{campusAgencyName},
-
- #{departmentId},
-
- #{departmentName},
-
- #{wardId},
-
- #{wardName},
-
- #{admissionNumber},
-
- #{responsibleNurse},
-
- #{visitSerialNumber},
-
- #{surgicalName},
-
- #{admissionDate},
-
- #{dischargeDate},
-
- #{medicalRecordContent},
-
- #{appointmentTreatmentGroup},
-
- #{registrationNo},
-
- #{registrationDate},
-
- #{appointmentDate},
-
- #{outpatientNumber},
-
- #{visitTime},
-
- #{dischargeMethod},
-
- #{openId},
-
- #{unionId},
-
- #{officialAccountOpenId},
-
- #{patientSource},
-
- #{delFlag},
-
- #{createBy},
-
- #{createTime},
-
- #{updateBy},
-
- #{updateTime},
-
-
-
insert into patient_info
@@ -703,151 +353,6 @@
-
- update patient_info
-
-
- patient_name = #{patientName},
-
-
- patient_phone = #{patientPhone},
-
-
- family_member_phone = #{familyMemberPhone},
-
-
- birth_date = #{birthDate},
-
-
- card_no = #{cardNo},
-
-
- sex = #{sex},
-
-
- address = #{address},
-
-
- patient_type = #{patientType},
-
- sign_status =
- #{signStatus},
-
- sign_patient_record_id = #{signPatientRecordId},
-
- service_status = #{serviceStatus},
-
- sign_time =
- #{signTime},
-
- certificate_issuing_doctor =
- #{certificateIssuingDoctor},
-
- visit_method =
- #{visitMethod},
-
- main_diagnosis =
- #{mainDiagnosis},
-
- attending_physician =
- #{attendingPhysician},
-
- hospital_agency_id =
- #{hospitalAgencyId},
-
- hospital_agency_name =
- #{hospitalAgencyName},
-
- campus_agency_id =
- #{campusAgencyId},
-
- campus_agency_name =
- #{campusAgencyName},
-
- department_id =
- #{departmentId},
-
- department_name =
- #{departmentName},
-
- ward_id =
- #{wardId},
-
- ward_name =
- #{wardName},
-
- admission_number =
- #{admissionNumber},
-
- responsible_nurse =
- #{responsibleNurse},
-
- visit_serial_number =
- #{visitSerialNumber},
-
- surgical_name =
- #{surgicalName},
-
-
- admission_date = #{admissionDate},
-
-
- discharge_date = #{dischargeDate},
-
- medical_record_content =
- #{medicalRecordContent},
-
- appointment_treatment_group =
- #{appointmentTreatmentGroup},
-
- registration_no =
- #{registrationNo},
-
- registration_date =
- #{registrationDate},
-
- appointment_date =
- #{appointmentDate},
-
- outpatient_number =
- #{outpatientNumber},
-
- visit_time =
- #{visitTime},
-
- discharge_method =
- #{dischargeMethod},
-
- open_id =
- #{openId},
-
- union_id =
- #{unionId},
-
- official_account_openid =
- #{officialAccountOpenId},
-
- patient_source =
- #{patientSource},
-
- del_flag =
- #{delFlag},
-
- create_by =
- #{createBy},
-
- create_time =
- #{createTime},
-
- update_by =
- #{updateBy},
-
- update_time =
- #{updateTime},
-
-
- where id = #{id}
-
update patient_info
@@ -993,12 +498,6 @@
#{id}
-
- update patient_info set del_flag = 1 where id in
-
- #{id}
-
-