Merge branch 'dev/20220407_v2.3.0通用版_医生质控平均分报表' into debug

src/main/java/com/diagbot/dto/GetDoctorDetailPageDTO.java

@@ -57,7 +57,7 @@ public class GetDoctorDetailPageDTO implements Serializable {
     private Integer ruleType;
 
     @ApiModelProperty(value = "医生ID")
-    private Long doctorId;
+    private String doctorId;
 
     @ApiModelProperty(value = "医生名称")
     private String doctorName;

src/main/java/com/diagbot/facade/BehospitalInfoFacade.java

@@ -262,7 +262,11 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
             //通过页面类型显示不同操作按钮
             showButtonByPageType(hospitalId, getDetailVO, res);
             //添加核查操作是否与申诉状态关联配置
-            res.put("checkOperationWithAppeal", sysHospitalSetFacade.getValue(hospitalId, "check_operation_with_appeal"));
+            if(StringUtil.isBlank(sysHospitalSetFacade.getValue(hospitalId, "check_operation_with_appeal"))){
+                res.put("checkOperationWithAppeal", false);
+            }else{
+                res.put("checkOperationWithAppeal",Boolean.parseBoolean(sysHospitalSetFacade.getValue(hospitalId, "check_operation_with_appeal")));
+            }
         }
 
         // 获取提示信息

src/main/java/com/diagbot/facade/ConsoleByDoctorFacade.java

@@ -88,6 +88,7 @@ public class ConsoleByDoctorFacade {
      * @return
      */
     public IPage<GetDoctorDetailPageDTO> getDoctorDetailPage(GetDoctorDetailPageVO getDoctorDetailPageVO) {
+        getDoctorDetailPageVO.setHospitalId(SysUserUtils.getCurrentHospitalID());
         IPage<GetDoctorDetailPageDTO> detailPageList = behospitalInfoFacade.getBaseMapper().getDoctorDetailPage(getDoctorDetailPageVO);
         return detailPageList;
     }
@@ -99,6 +100,7 @@ public class ConsoleByDoctorFacade {
      * @return
      */
     public IPage<GetDetailRecordListPageDTO> getDetailRecordListPage(GetDetailRecordListPageVO getDetailRecordListPageVO) {
+        getDetailRecordListPageVO.setHospitalId(SysUserUtils.getCurrentHospitalID());
         IPage<GetDetailRecordListPageDTO> detailPageList = behospitalInfoFacade.getBaseMapper().getDetailRecordListPage(getDetailRecordListPageVO);
         return detailPageList;
     }