修改就诊

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

@@ -939,7 +939,12 @@ public class PmsPatientVo {
         private Byte dwellingState;
         private String birthday;
         private String contactName;
-
+        @ApiModelProperty("上次测评时间")
+        private Date lastEvaluationTime;
+        @ApiModelProperty("测评师名称")
+        private String lastTesterName;
+        @ApiModelProperty("总测评次数")
+        private Integer evaluationCount;
         @ApiModelProperty("其他病史信息")
         private Map<String,List<Map<String, Object>>> otherMsg;
 

ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/controller/PmsController.java

@@ -254,13 +254,13 @@ public class PmsController extends BaseController {
     public JsonResponse<PageInfo<PmsPatientVo.QueryPatientJz>> queryPatientJzList(@RequestBody @Validated BaseDto<PmsPatientDto.QueryPatientJz> dto){
         //获取用户的权限
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        //当前默认一个用户只有一个角色
+//        //当前默认一个用户只有一个角色
-        String dataScope = "5";
+//        String dataScope = "5";
-        if(CollUtil.isNotEmpty(loginUser.getUser().getRoles())){
+//        if(CollUtil.isNotEmpty(loginUser.getUser().getRoles())){
-            dataScope = loginUser.getUser().getRoles().get(0).getDataScope();
+//            dataScope = loginUser.getUser().getRoles().get(0).getDataScope();
-        }
+//        }
-        dto.getParam().setDeptId(loginUser.getDeptId());
+//        dto.getParam().setDeptId(loginUser.getDeptId());
-
+//
 
         List<Long> deptIdList = new ArrayList<>();
         if (dto.getParam().getDeptId() == null) {
@@ -281,7 +281,7 @@ public class PmsController extends BaseController {
         }
 
         startPage(dto);
-        return JsonResponse.ok(new PageInfo<>(patientService.queryPatientJzList(dto.getParam(), dataScope, loginUser.getUserId(),loginUser.getUsername(), deptIdList)));
+        return JsonResponse.ok(new PageInfo<>(patientService.queryPatientJzList(dto.getParam(), null, loginUser.getUserId(),loginUser.getUsername(), deptIdList)));
     }
 
     @ApiOperation("导出患者就诊列表")

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

@@ -402,7 +402,6 @@
         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,
@@ -417,12 +416,14 @@
         p.career,
         p.address,
         p.native_place as nativePlace,
-        p.contact_name as contactName
+        p.contact_name as contactName,
-
+        MAX(ee.create_time) AS lastEvaluationTime,
+        COUNT(ee.id) AS evaluationCount
         from
         pms_patient_body b
         left join pms_patient p on b.patient_id = p.id
         left join ums_user uu on b.create_by = uu.user_name
+        left join ems_evaluation ee on b.patient_id = ee.patient_id
         <where>
             b.del_flag = 0 and p.del_flag = 0
             <if test="param.visitType != null">
@@ -455,9 +456,7 @@
             </if>
 
         </where>
+        group by b.id
         order by b.id desc
-
-
-
     </select>
 </mapper>