1、医院接收人、抄送人，提供分页接口

2、分数调整

src/main/java/com/diagbot/facade/his/DoctorHosFacade.java

@@ -1,8 +1,12 @@
 package com.diagbot.facade.his;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.diagbot.dto.GetEntryDefectImproveDeptDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.his.DoctorHosDTO;
+import com.diagbot.entity.MedNurse;
 import com.diagbot.entity.his.DoctorHos;
 import com.diagbot.service.impl.his.DoctorHosServiceImpl;
 import com.diagbot.util.BeanUtil;
@@ -34,4 +38,30 @@ public class DoctorHosFacade extends DoctorHosServiceImpl {
         }
         return dto;
     }
+
+    public IPage<DoctorHosDTO> getDoctorPage(DoctorHosVO doctorHosVO){
+        IPage<DoctorHosDTO> pageDto = new Page<>();
+        try{
+            QueryWrapper<DoctorHos> query = new QueryWrapper<>();
+            query.notIn("JOB","护士");
+            if(StringUtil.isNotEmpty(doctorHosVO.getKeyString())){
+                query.like("USER_ID",doctorHosVO.getKeyString().toUpperCase()).or()
+                        .like("NAME",doctorHosVO.getKeyString()).or()
+                        .like("DEPT_CODE",doctorHosVO.getKeyString()).or()
+                        .like("DEPT_NAME",doctorHosVO.getKeyString());
+            }
+            Page<DoctorHos> pageHos = new Page<>(doctorHosVO.getCurrent(),doctorHosVO.getSize());
+            IPage<DoctorHos> hosPage=this.baseMapper.selectPage(pageHos,query);
+            List<DoctorHosDTO> dtoList=Lists.newLinkedList();
+            hosPage.getRecords().forEach(s->{
+                DoctorHosDTO dto=new DoctorHosDTO();
+                BeanUtil.copyProperties(s,dto);
+                dtoList.add(dto);
+            });
+            pageDto.setRecords(dtoList);
+        }catch (Exception e){
+            log.error("获取医生信息异常"+e.getMessage(),new Throwable());
+        }
+        return pageDto;
+    }
 }

src/main/java/com/diagbot/util/PushFeedbackConn.java

@@ -151,7 +151,7 @@ public class PushFeedbackConn {
             state.setString(7,feedbackHosVO.getDeptId());
             state.setInt(8,0);
             state.setString(9,feedbackHosVO.getExplainInfo());//缺陷说明
-            state.setInt(10, feedbackHosVO.getQcresultDetaiScore()!=null?feedbackHosVO.getQcresultDetaiScore().intValue():0);
+            state.setString(10, String.format("%.2f", feedbackHosVO.getQcresultDetaiScore()));
             if(feedbackHosVO.getOperationType().equals("4")){
                 state.setString(11,Long.toString(feedbackHosVO.getId()));//缺陷编号
             }else{

src/main/java/com/diagbot/util/TZDBConn.java

@@ -671,7 +671,7 @@ public class TZDBConn {
 				behospitalInfo.setIsPlacefile(rs.getString("isPlacefile"));//是否归档
 				behospitalInfo.setPlacefileDate(StringUtils.isNotBlank(rs.getString("placefileDate"))?DateUtil.parseDateTime(rs.getString("placefileDate")):null);//归档时间
 //				behospitalInfo.setInstate(rs.getString("Instate"));//病人状态
-				behospitalInfo.setIsQcType(rs.getString("is_qc_type"));
+				behospitalInfo.setIsQcType(rs.getString("qc_type"));
 				behospitalInfo.setIsDaytime(rs.getString("IS_DAYTIME"));//是否日间病例,1:是，0:否
 				behospitalInfoList.add(behospitalInfo);
 			}

src/main/java/com/diagbot/vo/his/DoctorHosVO.java

@@ -1,9 +1,10 @@
 package com.diagbot.vo.his;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.Data;
 
 @Data
-public class DoctorHosVO {
+public class DoctorHosVO extends Page {
     private String keyString;
     /*
     private String userId;

src/main/java/com/diagbot/web/DataViewController.java

@@ -1,6 +1,7 @@
 package com.diagbot.web;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.his.DoctorHosDTO;
@@ -44,6 +45,13 @@ public class DataViewController {
         return RespDTO.onSuc(doctorHosFacade.getDoctorInfo(doctorHosVO));
     }
 
+    @ApiOperation(value = "获取HIS医生信息")
+    @PostMapping("/getDoctorPage")
+    @SysLogger("getDoctorPage")
+    public RespDTO<IPage<DoctorHosDTO>> getDoctorPage(@RequestBody DoctorHosVO doctorHosVO){
+        return RespDTO.onSuc(doctorHosFacade.getDoctorPage(doctorHosVO));
+    }
+
 
     @ApiOperation(value = "推送缺陷反馈到HIS")
     @PostMapping("/pushFeedback")