修改就诊列表

ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/vo/PmsPatientVo.java

@@ -893,7 +893,51 @@ public class PmsPatientVo {
 
         private String hospitalName;
         private Integer birthYear;
-
+        @ApiModelProperty("病人名字")
+        private String name;
+        @ApiModelProperty("名称首字母")
+        private String nameInitial;
+        @ApiModelProperty("名称全全拼")
+        private String nameFull;
+        @ApiModelProperty("病人门诊号")
+        private String patientNumber;
+        @ApiModelProperty("病人住院号")
+        private String hospitalNumber;
+        @ApiModelProperty("婚姻状况（1：未婚2：已婚 3：离异 4：分居 5：丧偶 6：同居 7：其他 ）")
+        private Byte maritalStatus;
+        @ApiModelProperty("教育程度（1：文盲 2：小学 3：初中 4：高中 5：大学 6：大学以上 7：其他）")
+        private Byte educationalStatus;
+        @ApiModelProperty("受教育时间（年或月）")
+        private String educationalStatusUnit;
+        @ApiModelProperty("民族")
+        private String nation;
+        @ApiModelProperty("籍贯")
+        private String nativePlace;
+        @ApiModelProperty("职业（1：农林牧渔水利生产人员 2：教师 3：医务工作者 4：专业技术人员 5：生产、运输设备操作人员及有关人员6：商业、服务业人员7：国家机关、事业单位、企业负责人8：国家机关、事业单位、企业办事人员和有关人员9：军人 10：媒体、文体类工作人员 11：在校学生 12：未就业 13：家务 14：其他")
+        private Byte career;
+        @ApiModelProperty("生育数量")
+        private Integer birthNumber;
+        @ApiModelProperty("绝经年龄（女）")
+        private Integer menopauseAge;
+        @ApiModelProperty("联系人")
+        private String contact;
+        @ApiModelProperty("手机")
+        private String mobile;
+        @ApiModelProperty("电话")
+        private String phone;
+        @ApiModelProperty("省份")
+        private String province;
+        @ApiModelProperty("城市")
+        private String city;
+        @ApiModelProperty("住址")
+        private String address;
+        @ApiModelProperty("住所（1：自己家中 2：养老院 3：其他）")
+        private Byte domicile;
+        @ApiModelProperty("独立生活能力（1：能够独立生活 2：需要他人帮助完成复杂活动 3：需要他人帮助完成基本活动 4：完全依赖他人生活 5：未知 6：其他）")
+        private Byte independentLivingSkills;
+        @ApiModelProperty("居住状态（1：独居 2：与配偶或对象或子女 3：与亲戚或朋友居住）")
+        private Byte dwellingState;
+        private String birthday;
         @ApiModelProperty("其他病史信息")
         private Map<String,List<Map<String, Object>>> otherMsg;
 

ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/vo/RmsVo.java

@@ -185,7 +185,7 @@ public class RmsVo {
 
         private String visitNo;
         private String scaleName;
-        private Byte needPlan;
+        private Integer needPlan;
 
         private String deptName;
         private Byte evaluationStatus = 1;

ruisi_java/ruisi-web-admin/src/main/resources/mapper/dao/PmsPatientDao.xml

@@ -281,7 +281,23 @@
         b.is_main_diagnosis as isMainDiagnosis,
         b.diagnosis_code as diagnosisCode,
         b.diagnosis_name as diagnosisName,
-        b.diagnosis_date as diagnosisDate
+        b.diagnosis_date as diagnosisDate,
+        p.hospital_id as hospitalId,
+        p.hospital_number as hospitalNumber,
+        p.patient_number as patientNumber,
+        p.native_place as nativePlace,
+        p.nation,
+        p.phone,
+        p.mobile,
+        p.birth_year as birthYear,
+        p.birth_number as birthNumber,
+        p.menopause_age as menopauseAge,
+        p.educational_status as  educationalStatus,
+        p.educational_status_unit as educationalStatusUnit,
+        p.marital_status as maritalStatus,
+        p.dwelling_state as dwellingState,
+        p.birthday,
+        p.career
 
         from
         pms_patient_body b

ruisi_java/ruisi-web-admin/src/main/resources/mapper/dao/RmsDao.xml

@@ -1438,7 +1438,7 @@ d.dept_name                as hospitalName
         select
         e.id,
         e.id as evaluationId,
-        e.doctor_name as testerName,
+        u.nick_name as testerName,
         e.patient_id as patientId,
         pp.name as name,
         e.patient_idcard as patientIdcard,