修改邵逸夫质控代码

src/main/java/com/diagbot/config/RedisConfigurer.java

@@ -130,7 +130,7 @@ public class RedisConfigurer extends CachingConfigurerSupport {
             sb.append(":");
             sb.append(method.getName());
             for (Object obj : params) {
-                sb.append(":" + String.valueOf(obj));
+                sb.append(":" + obj);
             }
             String rsToUse = String.valueOf(sb);
             log.info("自动生成Redis Key -> [{}]", rsToUse);

src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -147,6 +147,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/qc/data/deleteFlag").permitAll()
                 .antMatchers("/qc/data/sendPacsResults").permitAll()
                 .antMatchers("/qc/data/sendLisResults").permitAll()
+                .antMatchers("/base/patientInfo/savePatientList").permitAll()
                 .antMatchers("/**").authenticated();
         //                .antMatchers("/**").permitAll();
     }

src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -72,7 +72,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
     }
 
     private Boolean matchPermitAllUrl(HttpServletRequest request) {
-        if (matchers("/swagger/**", request)
+        return matchers("/swagger/**", request)
                 || matchers("/v2/**", request)
                 || matchers("/swagger-ui.html/**", request)
                 || matchers("/swagger-resources/**", request)
@@ -176,17 +176,12 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/qc/data/deleteFlag", request)
                 || matchers("/qc/data/sendLisResults", request)
                 || matchers("/qc/data/sendPacsResults", request)
-                || matchers("/", request)) {
-            return true;
-        }
-        return false;
+                || matchers("/base/patientInfo/savePatientList", request)
+                || matchers("/", request);
     }
 
     private boolean matchers(String url, HttpServletRequest request) {
         AntPathRequestMatcher matcher = new AntPathRequestMatcher(url);
-        if (matcher.matches(request)) {
-            return true;
-        }
-        return false;
+        return matcher.matches(request);
     }
 }

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

@@ -140,20 +140,20 @@ public interface Constants {
     /**
      * 地域标示
      */
-    public static final String DEFAULT_LOCALE = "zh_CN";
+    String DEFAULT_LOCALE = "zh_CN";
     /**
      * 缺省字符集
      */
-    public static final String DEFAULT_ENCODE = "UTF-8";
+    String DEFAULT_ENCODE = "UTF-8";
     /**
      * 以下为接口返回公共属性定义常量
      */
-    public static final String MSG_SUCCESS = "操作成功";	//操作成功
-    public static final String MSG_FALURE = "操作失败";	//操作失败
+    String MSG_SUCCESS = "操作成功";	//操作成功
+    String MSG_FALURE = "操作失败";	//操作失败
     
-    public static final long INVALIDATE_VALUE = -1;		//起止时间定义
-    public static final int RET_SUCCESS = 0; 			//成功
-	public static final int RET_FAIL = 1; 				//失败
-	public static final int RET_ERROR_PARAM = -1; 		//参数校验失败
-	public static final int RET_NO_TOKEN = -2; 	//用户token丢失
+    long INVALIDATE_VALUE = -1;		//起止时间定义
+    int RET_SUCCESS = 0; 			//成功
+	int RET_FAIL = 1; 				//失败
+	int RET_ERROR_PARAM = -1; 		//参数校验失败
+	int RET_NO_TOKEN = -2; 	//用户token丢失
 }

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

@@ -124,7 +124,7 @@ public enum Status {
 
 	private final int value;
 
-	private Status(int value) {
+	Status(int value) {
 		this.value = value;
 	}
 

src/main/java/com/diagbot/entity/shaoyifu/entity/PatientInfo.java

@@ -152,13 +152,19 @@ public class PatientInfo implements Serializable {
     @Override
     public String toString() {
         return "PatientInfo{" +
-            "id=" + id +
-            ", behospitalCode=" + behospitalCode +
-            ", rdn=" + rdn +
-            ", mrn=" + mrn +
-            ", series=" + series +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-        "}";
+                "id=" + id +
+                ", behospitalCode='" + behospitalCode + '\'' +
+                ", rdn='" + rdn + '\'' +
+                ", mrn='" + mrn + '\'' +
+                ", series='" + series + '\'' +
+                ", name='" + name + '\'' +
+                ", behospitalDate=" + behospitalDate +
+                ", leaveHospitalDate=" + leaveHospitalDate +
+                ", deptId='" + deptId + '\'' +
+                ", inDate=" + inDate +
+                ", checkDate=" + checkDate +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                '}';
     }
 }

src/main/java/com/diagbot/entity/shaoyifu/util/HttpApi.java

@@ -30,7 +30,7 @@ public class HttpApi<T> {
     public HttpApi() {
     }
 
-    public String doPost(String httpUrl, Object obj) throws ConnectException, Exception {
+    public String doPost(String httpUrl, Object obj) throws Exception {
         JsonMapper mapper = JsonMapper.nonEmptyMapper();
 
         try {
@@ -60,7 +60,7 @@ public class HttpApi<T> {
         }
     }
 
-    public T doPostReplace(String httpUrl, Object obj, Class<T> type) throws ConnectException, Exception {
+    public T doPostReplace(String httpUrl, Object obj, Class<T> type) throws Exception {
         JsonMapper mapper = JsonMapper.nonEmptyMapper();
 
         try {
@@ -90,7 +90,7 @@ public class HttpApi<T> {
         }
     }
 
-    public List<T> doListPost(String httpUrl, String string, Class<T> type) throws ConnectException, Exception {
+    public List<T> doListPost(String httpUrl, String string, Class<T> type) throws Exception {
         JsonMapper mapper = JsonMapper.nonEmptyMapper();
 
         try {
@@ -138,7 +138,7 @@ public class HttpApi<T> {
         }
     }
 
-    public String receivePost(HttpServletRequest request) throws IOException, UnsupportedEncodingException {
+    public String receivePost(HttpServletRequest request) throws IOException {
         BufferedReader br = new BufferedReader(new InputStreamReader(request.getInputStream()));
         String line = null;
         StringBuilder sb = new StringBuilder();

src/main/java/com/diagbot/facade/data/AHomePageFacade.java

@@ -305,7 +305,6 @@ public class AHomePageFacade extends HomePageServiceImpl {
                             }
                         }
                     }
-                    ;
 
                     //住院手术
                     if (aHomePageVO.getOperations() != null && aHomePageVO.getOperations().size() > 0) {

src/main/java/com/diagbot/facade/data/APatientListFacade.java

@@ -31,8 +31,8 @@ public class APatientListFacade extends PatientInfoServiceImpl {
     public PatientListResponse savePatientList(PatientListRequest patientListRequest) {
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
-        /*patientListRequest.setDATESTART("2020-06-17 00:00:00");
-        patientListRequest.setDATEEND("2020-06-23 00:00:00");*/
+        patientListRequest.setDATESTART("2020-06-17 00:00:00");
+        patientListRequest.setDATEEND("2020-06-23 00:00:00");
 
         SYFNlRequest<PatientListRequest> request = new SYFNlRequest<>();
         request.setData(patientListRequest);

src/main/java/com/diagbot/mapper/BasDoctorInfoMapper.java

@@ -15,6 +15,6 @@ import java.util.List;
  */
 public interface BasDoctorInfoMapper extends BaseMapper<BasDoctorInfo> {
 
-    public void updateBatchByKey(List<BasDoctorInfo> list);
+    void updateBatchByKey(List<BasDoctorInfo> list);
 
 }

src/main/java/com/diagbot/mapper/BehospitalInfoMapper.java

@@ -37,11 +37,11 @@ import java.util.List;
  */
 public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
 
-    public IPage<BehospitalInfoDTO> getPage(BehospitalPageVO behospitalPageVO);
+    IPage<BehospitalInfoDTO> getPage(BehospitalPageVO behospitalPageVO);
 
-    public List<MsgDTO> getMsg(AnalyzeVO analyzeVO);
+    List<MsgDTO> getMsg(AnalyzeVO analyzeVO);
 
-    public List<MsgDTO> getMsgByEntryCode(AnalyzeCodeVO analyzeCodeVO);
+    List<MsgDTO> getMsgByEntryCode(AnalyzeCodeVO analyzeCodeVO);
 
     /**
      * 各科室缺陷占比-全院-首页
@@ -49,7 +49,7 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      * @param filterVO
      * @return
      */
-    public List<NumDTO> entryByDept(FilterVO filterVO);
+    List<NumDTO> entryByDept(FilterVO filterVO);
 
     /**
      * 质控结果缺陷总数查询
@@ -57,9 +57,9 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      * @param filterVO
      * @return
      */
-    public int getTotleResultNum(FilterVO filterVO);
+    int getTotleResultNum(FilterVO filterVO);
 
-    public List<BehospitalInfo> getNoGrade(TaskVO taskVO);
+    List<BehospitalInfo> getNoGrade(TaskVO taskVO);
 
     IPage<BehospitalInfoDTO> getPageByDept(BehospitalPageVO behospitalPageVO);
 
@@ -73,7 +73,7 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      * @param filterVO
      * @return
      */
-    public int leaveHosCount(FilterVO filterVO);
+    int leaveHosCount(FilterVO filterVO);
 
     /**
      * 新生儿出院人数统计-全院-首页
@@ -81,7 +81,7 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      * @param filterVO
      * @return
      */
-    public int newBornCount(FilterVO filterVO);
+    int newBornCount(FilterVO filterVO);
 
     /**
      * 死亡人数统计-全院-首页
@@ -89,7 +89,7 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      * @param filterVO
      * @return
      */
-    public int deathCount(FilterVO filterVO);
+    int deathCount(FilterVO filterVO);
 
     /**
      * 手术人数统计-全院-首页
@@ -97,7 +97,7 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      * @param filterVO
      * @return
      */
-    public int operationCount(FilterVO filterVO);
+    int operationCount(FilterVO filterVO);
 
     /**
      * 出院总人数统计-科室-首页
@@ -105,7 +105,7 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      * @param filterVO
      * @return
      */
-    public List<NumDTO> leaveHosCountByDept(FilterVO filterVO);
+    List<NumDTO> leaveHosCountByDept(FilterVO filterVO);
 
     /**
      * 新生儿出院人数统计-科室-首页
@@ -113,7 +113,7 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      * @param filterVO
      * @return
      */
-    public List<NumDTO> newBornCountByDept(FilterVO filterVO);
+    List<NumDTO> newBornCountByDept(FilterVO filterVO);
 
     /**
      * 死亡人数统计-科室-首页
@@ -121,7 +121,7 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      * @param filterVO
      * @return
      */
-    public List<NumDTO> deathCountByDept(FilterVO filterVO);
+    List<NumDTO> deathCountByDept(FilterVO filterVO);
 
     /**
      * 手术人数统计-科室-首页
@@ -129,7 +129,7 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      * @param filterVO
      * @return
      */
-    public List<NumDTO> operationCountByDept(FilterVO filterVO);
+    List<NumDTO> operationCountByDept(FilterVO filterVO);
 
     /**
      * 各科室缺陷占比排行（分页）
@@ -137,7 +137,7 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      * @param filterPageVO
      * @return
      */
-    public IPage<NumDTO> resultStatisticsByDeptPage(@Param("filterPageVO") FilterPageVO filterPageVO);
+    IPage<NumDTO> resultStatisticsByDeptPage(@Param("filterPageVO") FilterPageVO filterPageVO);
 
     /**
      * 各科室缺陷占比（组合）
@@ -145,7 +145,7 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      * @param filterOrderVO
      * @return
      */
-    public List<LevelStatisticsDTO> levelStatistics(FilterOrderVO filterOrderVO);
+    List<LevelStatisticsDTO> levelStatistics(FilterOrderVO filterOrderVO);
 
     /**
      * 病案首页合格率占比
@@ -153,7 +153,7 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      * @param filterOrderVO
      * @return
      */
-    public List<HomePageNumDTO> homePageLevelStatistics(FilterOrderVO filterOrderVO);
+    List<HomePageNumDTO> homePageLevelStatistics(FilterOrderVO filterOrderVO);
 
     /**
      * 各科室缺陷占比（主任医生）
@@ -161,7 +161,7 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      * @param filterOrderByDeptVO
      * @return
      */
-    public List<LevelStatisticsDTO> levelStatisticsByDept(FilterOrderByDeptVO filterOrderByDeptVO);
+    List<LevelStatisticsDTO> levelStatisticsByDept(FilterOrderByDeptVO filterOrderByDeptVO);
 
     /**
      * 病案首页合格率占比（主任医生）
@@ -169,7 +169,7 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      * @param filterOrderByDeptVO
      * @return
      */
-    public List<HomePageNumDTO> homePageLevelStatisticsByDept(FilterOrderByDeptVO filterOrderByDeptVO);
+    List<HomePageNumDTO> homePageLevelStatisticsByDept(FilterOrderByDeptVO filterOrderByDeptVO);
 
     /**
      * 科室缺陷占比-科室（分页）
@@ -177,7 +177,7 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      * @param filterPageByDeptVO
      * @return
      */
-    public IPage<DeptNumDTO> resultStatisticsByDeptAndDoctorPage(@Param("filterPageByDeptVO") FilterPageByDeptVO filterPageByDeptVO);
+    IPage<DeptNumDTO> resultStatisticsByDeptAndDoctorPage(@Param("filterPageByDeptVO") FilterPageByDeptVO filterPageByDeptVO);
 
     /**
      * 各科室缺陷占比（组合）-全院-根据内外科系统统计（台州）
@@ -185,7 +185,7 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      * @param filterOrderVO
      * @return
      */
-    public List<LevelStatisticsTZDTO> levelStatisticsByDeptClass(FilterOrderVO filterOrderVO);
+    List<LevelStatisticsTZDTO> levelStatisticsByDeptClass(FilterOrderVO filterOrderVO);
 
     /**
      * 各科室缺陷占比（组合）-全院-根据内外科系统统计（上级科室允许为空）（台州）
@@ -193,7 +193,7 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      * @param filterOrderVO
      * @return
      */
-    public List<LevelStatisticsTZDTO> levelStatisticsByDeptClass_TZ(FilterOrderVO filterOrderVO);
+    List<LevelStatisticsTZDTO> levelStatisticsByDeptClass_TZ(FilterOrderVO filterOrderVO);
 
 
     List<ExportExcelDTO> exportExcel();
@@ -204,7 +204,7 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      * @param exportQcresultVO
      * @return
      */
-    public List<ExportExcelDTO> exportQcresult(ExportQcresultVO exportQcresultVO);
+    List<ExportExcelDTO> exportQcresult(ExportQcresultVO exportQcresultVO);
 
     /**
      * 科室质控评分导出到excel
@@ -212,7 +212,7 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      * @param exportQcresultVO
      * @return
      */
-    public List<ExportExcelDTO> exportQcresultByDept(ExportQcresultVO exportQcresultVO);
+    List<ExportExcelDTO> exportQcresultByDept(ExportQcresultVO exportQcresultVO);
 
     /**
      * 医疗组质控评分导出到excel
@@ -220,7 +220,7 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      * @param exportQcresultVO
      * @return
      */
-    public List<ExportExcelDTO> exportQcresultByGroup(ExportQcresultVO exportQcresultVO);
+    List<ExportExcelDTO> exportQcresultByGroup(ExportQcresultVO exportQcresultVO);
 
     /**
      * 条目缺陷质控评分页（内页）
@@ -228,7 +228,7 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      * @param qcResultShortPageVO
      * @return
      */
-    public IPage<QcResultShortDTO> qcResultShortPage(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
+    IPage<QcResultShortDTO> qcResultShortPage(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
 
     /**
      * 条目缺陷质控评分页-科室（内页）
@@ -236,11 +236,11 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      * @param qcResultShortPageVO
      * @return
      */
-    public IPage<QcResultShortDTO> qcResultShortByDeptPage(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
+    IPage<QcResultShortDTO> qcResultShortByDeptPage(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
 
     /**
      * 根据两个主键-批量修改
      * @param list
      */
-    public void updateBatchByKey(List<BehospitalInfo> list);
+    void updateBatchByKey(List<BehospitalInfo> list);
 }

src/main/java/com/diagbot/mapper/DoctorAdviceMapper.java

@@ -14,5 +14,5 @@ import java.util.List;
  * @since 2020-04-13
  */
 public interface DoctorAdviceMapper extends BaseMapper<DoctorAdvice> {
-    public void updateBatchByKey(List<DoctorAdvice> list);
+    void updateBatchByKey(List<DoctorAdvice> list);
 }

src/main/java/com/diagbot/mapper/HomeDiagnoseInfoMapper.java

@@ -15,6 +15,6 @@ import java.util.List;
  */
 public interface HomeDiagnoseInfoMapper extends BaseMapper<HomeDiagnoseInfo> {
 
-    public void updateBatchByKey(List<HomeDiagnoseInfo> list);
+    void updateBatchByKey(List<HomeDiagnoseInfo> list);
 
 }

src/main/java/com/diagbot/mapper/HomeOperationInfoMapper.java

@@ -15,6 +15,6 @@ import java.util.List;
  */
 public interface HomeOperationInfoMapper extends BaseMapper<HomeOperationInfo> {
 
-    public void updateBatchByKey(List<HomeOperationInfo> list);
+    void updateBatchByKey(List<HomeOperationInfo> list);
 
 }

src/main/java/com/diagbot/mapper/HomePageMapper.java

@@ -27,7 +27,7 @@ public interface HomePageMapper extends BaseMapper<HomePage> {
      * @param filterVO
      * @return
      */
-    public List<AverageStatisticsDTO> getAverageDayNum(FilterVO filterVO);
+    List<AverageStatisticsDTO> getAverageDayNum(FilterVO filterVO);
 
     /**
      * 按科室统计平均费用
@@ -35,7 +35,7 @@ public interface HomePageMapper extends BaseMapper<HomePage> {
      * @param filterVO
      * @return
      */
-    public List<AverageStatisticsDTO> getAverageFee(FilterVO filterVO);
+    List<AverageStatisticsDTO> getAverageFee(FilterVO filterVO);
 
     /**
      * 按科室统计平均住院天数（分页）
@@ -43,7 +43,7 @@ public interface HomePageMapper extends BaseMapper<HomePage> {
      * @param filterPageByAverageVO
      * @return
      */
-    public IPage<AverageStatisticsDTO> getAverageDayNumPage(@Param("filterPageByAverageVO") FilterPageByAverageVO filterPageByAverageVO);
+    IPage<AverageStatisticsDTO> getAverageDayNumPage(@Param("filterPageByAverageVO") FilterPageByAverageVO filterPageByAverageVO);
 
     /**
      * 按科室统计平均费用（分页）
@@ -51,12 +51,12 @@ public interface HomePageMapper extends BaseMapper<HomePage> {
      * @param filterPageByAverageVO
      * @return
      */
-    public IPage<AverageStatisticsDTO> getAverageFeePage(@Param("filterPageByAverageVO") FilterPageByAverageVO filterPageByAverageVO);
+    IPage<AverageStatisticsDTO> getAverageFeePage(@Param("filterPageByAverageVO") FilterPageByAverageVO filterPageByAverageVO);
 
     /**
      * 根据病案首页编码、医院编码、病人住院ID-批量更新
      * @param list
      */
-    public void updateBatchByKey(List<HomePage> list);
+    void updateBatchByKey(List<HomePage> list);
 
 }

src/main/java/com/diagbot/mapper/MedCrisisInfoMapper.java

@@ -15,6 +15,6 @@ import java.util.List;
  */
 public interface MedCrisisInfoMapper extends BaseMapper<MedCrisisInfo> {
 
-    public void updateBatchByKey(List<MedCrisisInfo> list);
+    void updateBatchByKey(List<MedCrisisInfo> list);
 
 }

src/main/java/com/diagbot/mapper/MedLisResultMapper.java

@@ -18,5 +18,5 @@ public interface MedLisResultMapper extends BaseMapper<MedLisResult> {
      * 批量修改lis结果
      * @param list
      */
-    public void updateBatchByKey(List<MedLisResult> list);
+    void updateBatchByKey(List<MedLisResult> list);
 }

src/main/java/com/diagbot/mapper/MedPacsResultMapper.java

@@ -18,5 +18,5 @@ public interface MedPacsResultMapper extends BaseMapper<MedPacsResult> {
      * 批量修改lis结果
      * @param list
      */
-    public void updateBatchByKey(List<MedPacsResult> list);
+    void updateBatchByKey(List<MedPacsResult> list);
 }

src/main/java/com/diagbot/mapper/MedRecordTypeMapper.java

@@ -15,6 +15,6 @@ import java.util.List;
  */
 public interface MedRecordTypeMapper extends BaseMapper<MedRecordType> {
 
-    public void updateBatchByKey(List<MedRecordType> list);
+    void updateBatchByKey(List<MedRecordType> list);
 
 }

src/main/java/com/diagbot/mapper/MedicalRecordContentMapper.java

@@ -15,6 +15,6 @@ import java.util.List;
  */
 public interface MedicalRecordContentMapper extends BaseMapper<MedicalRecordContent> {
 
-    public void updateBatchByKey(List<MedicalRecordContent> list);
+    void updateBatchByKey(List<MedicalRecordContent> list);
 
 }

src/main/java/com/diagbot/mapper/MedicalRecordMapper.java

@@ -17,7 +17,7 @@ import java.util.List;
  */
 public interface MedicalRecordMapper extends BaseMapper<MedicalRecord> {
 
-    public List<RecordContentDTO> getRecordContent(RecordContentVO recordContentVO);
+    List<RecordContentDTO> getRecordContent(RecordContentVO recordContentVO);
 
-    public void updateBatchByKey(List<MedicalRecord> list);
+    void updateBatchByKey(List<MedicalRecord> list);
 }

src/main/java/com/diagbot/mapper/QcModuleInfoMapper.java

@@ -15,5 +15,5 @@ import com.diagbot.vo.GetModuleInfoOneVO;
  */
 public interface QcModuleInfoMapper extends BaseMapper<QcModuleInfo> {
 
-    public GetModuleInfoOneDTO getById(GetModuleInfoOneVO getModuleInfoOneVO);
+    GetModuleInfoOneDTO getById(GetModuleInfoOneVO getModuleInfoOneVO);
 }

src/main/java/com/diagbot/mapper/QcQuestionInfoMapper.java

@@ -18,8 +18,8 @@ import java.util.Map;
  */
 public interface QcQuestionInfoMapper extends BaseMapper<QcQuestionInfo> {
 
-    public List<QuestionInfoWrapper> getByQuestionMapping(Map map);
+    List<QuestionInfoWrapper> getByQuestionMapping(Map map);
 
-    public List<QuestionEntryDTO> getByCaseEntryIds(Map map);
+    List<QuestionEntryDTO> getByCaseEntryIds(Map map);
 
 }

src/main/java/com/diagbot/mapper/QcresultInfoMapper.java

@@ -34,7 +34,7 @@ public interface QcresultInfoMapper extends BaseMapper<QcresultInfo> {
      * @param qcresultFilterVO
      * @return
      */
-    public int getQcresultSelectively(QcresultFilterVO qcresultFilterVO);
+    int getQcresultSelectively(QcresultFilterVO qcresultFilterVO);
 
     /**
      * 质控病历数统计
@@ -42,7 +42,7 @@ public interface QcresultInfoMapper extends BaseMapper<QcresultInfo> {
      * @param qcresultFilterVO
      * @return
      */
-    public int resultCount(QcresultFilterVO qcresultFilterVO);
+    int resultCount(QcresultFilterVO qcresultFilterVO);
 
     /**
      * 按科室统计各等级病历百分比
@@ -50,7 +50,7 @@ public interface QcresultInfoMapper extends BaseMapper<QcresultInfo> {
      * @param filterVO
      * @return
      */
-    public List<QcResultPercentDTO> levelPercentGroupByDept(FilterVO filterVO);
+    List<QcResultPercentDTO> levelPercentGroupByDept(FilterVO filterVO);
 
     /**
      * 按模块统计缺陷数
@@ -58,7 +58,7 @@ public interface QcresultInfoMapper extends BaseMapper<QcresultInfo> {
      * @param filterVO
      * @return
      */
-    public List<NumDTO> entryCountGroupByCase(FilterVO filterVO);
+    List<NumDTO> entryCountGroupByCase(FilterVO filterVO);
 
     /**
      * 条目缺陷分组统计
@@ -66,7 +66,7 @@ public interface QcresultInfoMapper extends BaseMapper<QcresultInfo> {
      * @param filterVO
      * @return
      */
-    public List<NumDTO> entryCountGroupByEntry(FilterVO filterVO);
+    List<NumDTO> entryCountGroupByEntry(FilterVO filterVO);
 
     /**
      * 质控平均分按科室统计
@@ -74,7 +74,7 @@ public interface QcresultInfoMapper extends BaseMapper<QcresultInfo> {
      * @param filterVO
      * @return
      */
-    public List<AverageStatisticsDTO> getAverageScore(FilterVO filterVO);
+    List<AverageStatisticsDTO> getAverageScore(FilterVO filterVO);
 
     /**
      * 按科室统计质控病历数
@@ -82,7 +82,7 @@ public interface QcresultInfoMapper extends BaseMapper<QcresultInfo> {
      * @param qcresultFilterVO
      * @return
      */
-    public List<NumDTO> resultCountByDept(QcresultFilterVO qcresultFilterVO);
+    List<NumDTO> resultCountByDept(QcresultFilterVO qcresultFilterVO);
 
     /**
      * 各模块缺陷占比-按科室
@@ -90,7 +90,7 @@ public interface QcresultInfoMapper extends BaseMapper<QcresultInfo> {
      * @param filterVO
      * @return
      */
-    public List<DeptNumDTO> entryCountGroupByCaseAndDept(FilterVO filterVO);
+    List<DeptNumDTO> entryCountGroupByCaseAndDept(FilterVO filterVO);
 
     /**
      * 条目缺陷占比-按科室
@@ -98,7 +98,7 @@ public interface QcresultInfoMapper extends BaseMapper<QcresultInfo> {
      * @param filterVO
      * @return
      */
-    public List<DeptNumDTO> entryCountGroupByEntryAndDept(FilterVO filterVO);
+    List<DeptNumDTO> entryCountGroupByEntryAndDept(FilterVO filterVO);
 
     /**
      * 各模块缺陷占比（分页）
@@ -106,7 +106,7 @@ public interface QcresultInfoMapper extends BaseMapper<QcresultInfo> {
      * @param filterPageVO
      * @return
      */
-    public IPage<NumDTO> entryCountGroupByCasePage(@Param("filterPageVO") FilterPageVO filterPageVO);
+    IPage<NumDTO> entryCountGroupByCasePage(@Param("filterPageVO") FilterPageVO filterPageVO);
 
     /**
      * 缺陷详情（分页）
@@ -114,7 +114,7 @@ public interface QcresultInfoMapper extends BaseMapper<QcresultInfo> {
      * @param filterPageVO
      * @return
      */
-    public IPage<EntryNumDTO> entryCountGroupByEntryPage(@Param("filterPageVO") FilterPageVO filterPageVO);
+    IPage<EntryNumDTO> entryCountGroupByEntryPage(@Param("filterPageVO") FilterPageVO filterPageVO);
 
     /**
      * 各科室质控平均分（分页）
@@ -122,7 +122,7 @@ public interface QcresultInfoMapper extends BaseMapper<QcresultInfo> {
      * @param filterPageVO
      * @return
      */
-    public IPage<AverageStatisticsDTO> getAverageScoreByDeptPage(@Param("filterPageVO") FilterPageVO filterPageVO);
+    IPage<AverageStatisticsDTO> getAverageScoreByDeptPage(@Param("filterPageVO") FilterPageVO filterPageVO);
 
     /**
      * 各科室甲级病历占比排行（分页）
@@ -130,7 +130,7 @@ public interface QcresultInfoMapper extends BaseMapper<QcresultInfo> {
      * @param filterPageVO
      * @return
      */
-    public IPage<QcResultPercentDTO> levelPercentGroupByDeptPage(@Param("filterPageVO") FilterPageVO filterPageVO);
+    IPage<QcResultPercentDTO> levelPercentGroupByDeptPage(@Param("filterPageVO") FilterPageVO filterPageVO);
 
     /**
      * 各模块缺陷占比-科室（分页）
@@ -138,7 +138,7 @@ public interface QcresultInfoMapper extends BaseMapper<QcresultInfo> {
      * @param filterPageByDeptVO
      * @return
      */
-    public IPage<DeptNumDTO> entryCountGroupByCaseAndDeptPage(@Param("filterPageByDeptVO") FilterPageByDeptVO filterPageByDeptVO);
+    IPage<DeptNumDTO> entryCountGroupByCaseAndDeptPage(@Param("filterPageByDeptVO") FilterPageByDeptVO filterPageByDeptVO);
 
     /**
      * 缺陷详情-科室（分页）
@@ -146,14 +146,14 @@ public interface QcresultInfoMapper extends BaseMapper<QcresultInfo> {
      * @param filterPageByDeptVO
      * @return
      */
-    public IPage<DeptEntryNumDTO> entryCountGroupByEntryAndDeptPage(@Param("filterPageByDeptVO") FilterPageByDeptVO filterPageByDeptVO);
+    IPage<DeptEntryNumDTO> entryCountGroupByEntryAndDeptPage(@Param("filterPageByDeptVO") FilterPageByDeptVO filterPageByDeptVO);
 
     /**
      * 条目缺陷占比（内页）
      *
      * @return
      */
-    public IPage<EntryNumDTO> entryGroupByEntryInnerPage(@Param("filterPageVO") FilterPageVO filterPageVO);
+    IPage<EntryNumDTO> entryGroupByEntryInnerPage(@Param("filterPageVO") FilterPageVO filterPageVO);
 
     /**
      * 条目缺陷占比-科室（内页）
@@ -161,7 +161,7 @@ public interface QcresultInfoMapper extends BaseMapper<QcresultInfo> {
      * @param filterPageByDeptVO
      * @return
      */
-    public IPage<DeptEntryNumDTO> entryGroupByEntryAndDeptInnerPage(@Param("filterPageByDeptVO") FilterPageByDeptVO filterPageByDeptVO);
+    IPage<DeptEntryNumDTO> entryGroupByEntryAndDeptInnerPage(@Param("filterPageByDeptVO") FilterPageByDeptVO filterPageByDeptVO);
 
     /**
      * 各科室质控平均分（首页）-根据内外科系统统计
@@ -169,7 +169,7 @@ public interface QcresultInfoMapper extends BaseMapper<QcresultInfo> {
      * @param filterVO
      * @return
      */
-    public List<AverageStatisticsDTO> getAverageScoreByDeptClass(FilterVO filterVO);
+    List<AverageStatisticsDTO> getAverageScoreByDeptClass(FilterVO filterVO);
 
     /**
      * 单项否决缺陷占比
@@ -177,7 +177,7 @@ public interface QcresultInfoMapper extends BaseMapper<QcresultInfo> {
      * @param filterVO
      * @return
      */
-    public List<EntryNumDTO> entryRejectPercent(FilterVO filterVO);
+    List<EntryNumDTO> entryRejectPercent(FilterVO filterVO);
 
     /**
      * 各科室甲/乙/丙级病历占比
@@ -185,5 +185,5 @@ public interface QcresultInfoMapper extends BaseMapper<QcresultInfo> {
      * @param filterVO
      * @return
      */
-    public List<DeptNumDTO> qcResultLevelPercent(FilterVO filterVO);
+    List<DeptNumDTO> qcResultLevelPercent(FilterVO filterVO);
 }

src/main/java/com/diagbot/mapper/SysMenuMapper.java

@@ -21,7 +21,7 @@ public interface SysMenuMapper extends BaseMapper<SysMenu> {
      * @Author: ztg
      * @Date: 2018/9/14 13:57
      */
-    public List<SysMenuWrapper> getByRole(Long userId);
+    List<SysMenuWrapper> getByRole(Long userId);
 
 
     /**
@@ -29,7 +29,7 @@ public interface SysMenuMapper extends BaseMapper<SysMenu> {
      * @Author: ztg
      * @Date: 2018/9/14 13:59
      */
-    public List<SysMenuWrapper> getSubMenuById(Long id);
+    List<SysMenuWrapper> getSubMenuById(Long id);
 
-    public List<SysUserPermissionDTO> getByRolePermission(Long userId);
+    List<SysUserPermissionDTO> getByRolePermission(Long userId);
 }

src/main/java/com/diagbot/service/BehospitalInfoService.java

@@ -37,11 +37,11 @@ import java.util.List;
  */
 public interface BehospitalInfoService extends IService<BehospitalInfo> {
 
-    public IPage<BehospitalInfoDTO> getPage(BehospitalPageVO behospitalPageVO);
+    IPage<BehospitalInfoDTO> getPage(BehospitalPageVO behospitalPageVO);
 
-    public List<MsgDTO> getMsg(AnalyzeVO analyzeVO);
+    List<MsgDTO> getMsg(AnalyzeVO analyzeVO);
 
-    public List<MsgDTO> getMsgByEntryCode(AnalyzeCodeVO analyzeCodeVO);
+    List<MsgDTO> getMsgByEntryCode(AnalyzeCodeVO analyzeCodeVO);
 
     /**
      * 各科室缺陷占比-全院-首页
@@ -49,7 +49,7 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      * @param filterVO
      * @return
      */
-    public List<NumDTO> entryByDept(FilterVO filterVO);
+    List<NumDTO> entryByDept(FilterVO filterVO);
 
     /**
      * 质控结果缺陷总数查询
@@ -57,10 +57,10 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      * @param filterVO
      * @return
      */
-    public int getTotleResultNum(FilterVO filterVO);
+    int getTotleResultNum(FilterVO filterVO);
 
 
-    public List<BehospitalInfo> getNoGrade(TaskVO taskVO);
+    List<BehospitalInfo> getNoGrade(TaskVO taskVO);
 
     IPage<BehospitalInfoDTO> getPageByDept(BehospitalPageVO behospitalPageVO);
 
@@ -74,7 +74,7 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      * @param filterVO
      * @return
      */
-    public int leaveHosCount(FilterVO filterVO);
+    int leaveHosCount(FilterVO filterVO);
 
     /**
      * 新生儿出院人数统计-全院-首页
@@ -82,7 +82,7 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      * @param filterVO
      * @return
      */
-    public int newBornCount(FilterVO filterVO);
+    int newBornCount(FilterVO filterVO);
 
     /**
      * 死亡人数统计-全院-首页
@@ -90,7 +90,7 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      * @param filterVO
      * @return
      */
-    public int deathCount(FilterVO filterVO);
+    int deathCount(FilterVO filterVO);
 
     /**
      * 手术人数统计-全院-首页
@@ -98,7 +98,7 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      * @param filterVO
      * @return
      */
-    public int operationCount(FilterVO filterVO);
+    int operationCount(FilterVO filterVO);
 
     /**
      * 出院总人数统计-科室-首页
@@ -106,7 +106,7 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      * @param filterVO
      * @return
      */
-    public List<NumDTO> leaveHosCountByDept(FilterVO filterVO);
+    List<NumDTO> leaveHosCountByDept(FilterVO filterVO);
 
     /**
      * 新生儿出院人数统计-科室-首页
@@ -114,7 +114,7 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      * @param filterVO
      * @return
      */
-    public List<NumDTO> newBornCountByDept(FilterVO filterVO);
+    List<NumDTO> newBornCountByDept(FilterVO filterVO);
 
     /**
      * 死亡人数统计-科室-首页
@@ -122,7 +122,7 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      * @param filterVO
      * @return
      */
-    public List<NumDTO> deathCountByDept(FilterVO filterVO);
+    List<NumDTO> deathCountByDept(FilterVO filterVO);
 
     /**
      * 手术人数统计-科室-首页
@@ -130,7 +130,7 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      * @param filterVO
      * @return
      */
-    public List<NumDTO> operationCountByDept(FilterVO filterVO);
+    List<NumDTO> operationCountByDept(FilterVO filterVO);
 
     /**
      * 各科室缺陷占比排行（分页）
@@ -138,7 +138,7 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      * @param filterPageVO
      * @return
      */
-    public IPage<NumDTO> resultStatisticsByDeptPage(@Param("filterPageVO") FilterPageVO filterPageVO);
+    IPage<NumDTO> resultStatisticsByDeptPage(@Param("filterPageVO") FilterPageVO filterPageVO);
 
     /**
      * 各科室缺陷占比（组合）
@@ -146,7 +146,7 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      * @param filterOrderVO
      * @return
      */
-    public List<LevelStatisticsDTO> levelStatistics(FilterOrderVO filterOrderVO);
+    List<LevelStatisticsDTO> levelStatistics(FilterOrderVO filterOrderVO);
 
     /**
      * 病案首页合格率占比
@@ -154,7 +154,7 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      * @param filterOrderVO
      * @return
      */
-    public List<HomePageNumDTO> homePageLevelStatistics(FilterOrderVO filterOrderVO);
+    List<HomePageNumDTO> homePageLevelStatistics(FilterOrderVO filterOrderVO);
 
     /**
      * 各科室缺陷占比（主任医生）
@@ -162,7 +162,7 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      * @param filterOrderByDeptVO
      * @return
      */
-    public List<LevelStatisticsDTO> levelStatisticsByDept(FilterOrderByDeptVO filterOrderByDeptVO);
+    List<LevelStatisticsDTO> levelStatisticsByDept(FilterOrderByDeptVO filterOrderByDeptVO);
 
     /**
      * 病案首页合格率占比（主任医生）
@@ -170,7 +170,7 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      * @param filterOrderByDeptVO
      * @return
      */
-    public List<HomePageNumDTO> homePageLevelStatisticsByDept(FilterOrderByDeptVO filterOrderByDeptVO);
+    List<HomePageNumDTO> homePageLevelStatisticsByDept(FilterOrderByDeptVO filterOrderByDeptVO);
 
     /**
      * 缺陷明细-科室（分页）
@@ -178,7 +178,7 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      * @param filterPageByDeptVO
      * @return
      */
-    public IPage<DeptNumDTO> resultStatisticsByDeptAndDoctorPage(@Param("filterPageByDeptVO") FilterPageByDeptVO filterPageByDeptVO);
+    IPage<DeptNumDTO> resultStatisticsByDeptAndDoctorPage(@Param("filterPageByDeptVO") FilterPageByDeptVO filterPageByDeptVO);
 
     /**
      * 各科室缺陷占比（组合）-全院-根据内外科系统统计（台州）
@@ -186,7 +186,7 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      * @param filterOrderVO
      * @return
      */
-    public List<LevelStatisticsTZDTO> levelStatisticsByDeptClass(FilterOrderVO filterOrderVO);
+    List<LevelStatisticsTZDTO> levelStatisticsByDeptClass(FilterOrderVO filterOrderVO);
 
     /**
      * 各科室缺陷占比（组合）-全院-根据内外科系统统计（上级科室允许为空）（台州）
@@ -194,7 +194,7 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      * @param filterOrderVO
      * @return
      */
-    public List<LevelStatisticsTZDTO> levelStatisticsByDeptClass_TZ(FilterOrderVO filterOrderVO);
+    List<LevelStatisticsTZDTO> levelStatisticsByDeptClass_TZ(FilterOrderVO filterOrderVO);
 
     List<ExportExcelDTO> exportExcel();
 
@@ -204,7 +204,7 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      * @param exportQcresultVO
      * @return
      */
-    public List<ExportExcelDTO> exportQcresult(ExportQcresultVO exportQcresultVO);
+    List<ExportExcelDTO> exportQcresult(ExportQcresultVO exportQcresultVO);
 
     /**
      * 科室质控评分导出到excel
@@ -212,7 +212,7 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      * @param exportQcresultVO
      * @return
      */
-    public List<ExportExcelDTO> exportQcresultByDept(ExportQcresultVO exportQcresultVO);
+    List<ExportExcelDTO> exportQcresultByDept(ExportQcresultVO exportQcresultVO);
 
     /**
      * 科室质控评分导出到excel
@@ -220,7 +220,7 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      * @param exportQcresultVO
      * @return
      */
-    public List<ExportExcelDTO> exportQcresultByGroup(ExportQcresultVO exportQcresultVO);
+    List<ExportExcelDTO> exportQcresultByGroup(ExportQcresultVO exportQcresultVO);
 
     /**
      * 条目缺陷质控评分页（内页）
@@ -228,7 +228,7 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      * @param qcResultShortPageVO
      * @return
      */
-    public IPage<QcResultShortDTO> qcResultShortPage(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
+    IPage<QcResultShortDTO> qcResultShortPage(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
 
     /**
      * 条目缺陷质控评分页-科室（内页）
@@ -236,5 +236,5 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      * @param qcResultShortPageVO
      * @return
      */
-    public IPage<QcResultShortDTO> qcResultShortByDeptPage(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
+    IPage<QcResultShortDTO> qcResultShortByDeptPage(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
 }

src/main/java/com/diagbot/service/HomePageService.java

@@ -25,7 +25,7 @@ public interface HomePageService extends IService<HomePage> {
      * @param filterVO
      * @return
      */
-    public List<AverageStatisticsDTO> getAverageDayNum(FilterVO filterVO);
+    List<AverageStatisticsDTO> getAverageDayNum(FilterVO filterVO);
 
     /**
      * 按科室统计平均费用
@@ -33,7 +33,7 @@ public interface HomePageService extends IService<HomePage> {
      * @param filterVO
      * @return
      */
-    public List<AverageStatisticsDTO> getAverageFee(FilterVO filterVO);
+    List<AverageStatisticsDTO> getAverageFee(FilterVO filterVO);
 
     /**
      * 按科室统计平均住院天数（分页）
@@ -41,7 +41,7 @@ public interface HomePageService extends IService<HomePage> {
      * @param filterPageByAverageVO
      * @return
      */
-    public IPage<AverageStatisticsDTO> getAverageDayNumPage(@Param("filterPageByAverageVO") FilterPageByAverageVO filterPageByAverageVO);
+    IPage<AverageStatisticsDTO> getAverageDayNumPage(@Param("filterPageByAverageVO") FilterPageByAverageVO filterPageByAverageVO);
 
     /**
      * 按科室统计平均费用（分页）
@@ -49,5 +49,5 @@ public interface HomePageService extends IService<HomePage> {
      * @param filterPageByAverageVO
      * @return
      */
-    public IPage<AverageStatisticsDTO> getAverageFeePage(@Param("filterPageByAverageVO") FilterPageByAverageVO filterPageByAverageVO);
+    IPage<AverageStatisticsDTO> getAverageFeePage(@Param("filterPageByAverageVO") FilterPageByAverageVO filterPageByAverageVO);
 }

src/main/java/com/diagbot/service/MedicalRecordService.java

@@ -17,5 +17,5 @@ import java.util.List;
  */
 public interface MedicalRecordService extends IService<MedicalRecord> {
 
-    public List<RecordContentDTO> getRecordContent(RecordContentVO recordContentVO);
+    List<RecordContentDTO> getRecordContent(RecordContentVO recordContentVO);
 }

src/main/java/com/diagbot/service/QcCasesEntryHospitalService.java

@@ -20,7 +20,7 @@ import java.util.List;
  */
 public interface QcCasesEntryHospitalService extends IService<QcCasesEntryHospital> {
 
-    public IPage<List<QcCasesEntryHospitalDTO>> getQcCasesEntryAlls(QcCasesEntryHospitalVO qcCasesEntryHospitalVO);
+    IPage<List<QcCasesEntryHospitalDTO>> getQcCasesEntryAlls(QcCasesEntryHospitalVO qcCasesEntryHospitalVO);
 
     List<QcCasesEntryFindDTO> findQcCasesEntryAll(QcCasesEntryFindVO qcCasesEntryFindVO);
 }

src/main/java/com/diagbot/service/QcModuleInfoService.java

@@ -15,5 +15,5 @@ import com.diagbot.vo.GetModuleInfoOneVO;
  */
 public interface QcModuleInfoService extends IService<QcModuleInfo> {
 
-    public GetModuleInfoOneDTO getById(GetModuleInfoOneVO getModuleInfoOneVO);
+    GetModuleInfoOneDTO getById(GetModuleInfoOneVO getModuleInfoOneVO);
 }

src/main/java/com/diagbot/service/QcQuestionInfoService.java

@@ -24,7 +24,7 @@ public interface QcQuestionInfoService extends IService<QcQuestionInfo> {
      * @param map 参数
      * @return
      */
-    public List<QuestionInfoWrapper> getByQuestionMapping(Map map);
+    List<QuestionInfoWrapper> getByQuestionMapping(Map map);
 
-    public List<QuestionEntryDTO> getByCaseEntryIds(Map map);
+    List<QuestionEntryDTO> getByCaseEntryIds(Map map);
 }

src/main/java/com/diagbot/service/QcresultInfoService.java

@@ -34,7 +34,7 @@ public interface QcresultInfoService extends IService<QcresultInfo> {
      * @param qcresultFilterVO
      * @return
      */
-    public int getQcresultSelectively(QcresultFilterVO qcresultFilterVO);
+    int getQcresultSelectively(QcresultFilterVO qcresultFilterVO);
 
     /**
      * 质控病历数统计
@@ -42,7 +42,7 @@ public interface QcresultInfoService extends IService<QcresultInfo> {
      * @param qcresultFilterVO
      * @return
      */
-    public int resultCount(QcresultFilterVO qcresultFilterVO);
+    int resultCount(QcresultFilterVO qcresultFilterVO);
 
 
     /**
@@ -51,7 +51,7 @@ public interface QcresultInfoService extends IService<QcresultInfo> {
      * @param filterVO
      * @return
      */
-    public List<QcResultPercentDTO> levelPercentGroupByDept(FilterVO filterVO);
+    List<QcResultPercentDTO> levelPercentGroupByDept(FilterVO filterVO);
 
     /**
      * 按模块统计缺陷数
@@ -59,7 +59,7 @@ public interface QcresultInfoService extends IService<QcresultInfo> {
      * @param filterVO
      * @return
      */
-    public List<NumDTO> entryCountGroupByCase(FilterVO filterVO);
+    List<NumDTO> entryCountGroupByCase(FilterVO filterVO);
 
     /**
      * 条目缺陷分组统计
@@ -67,7 +67,7 @@ public interface QcresultInfoService extends IService<QcresultInfo> {
      * @param filterVO
      * @return
      */
-    public List<NumDTO> entryCountGroupByEntry(FilterVO filterVO);
+    List<NumDTO> entryCountGroupByEntry(FilterVO filterVO);
 
     /**
      * 质控平均分按科室统计
@@ -75,7 +75,7 @@ public interface QcresultInfoService extends IService<QcresultInfo> {
      * @param filterVO
      * @return
      */
-    public List<AverageStatisticsDTO> getAverageScore(FilterVO filterVO);
+    List<AverageStatisticsDTO> getAverageScore(FilterVO filterVO);
 
     /**
      * 按科室统计质控病历数
@@ -83,7 +83,7 @@ public interface QcresultInfoService extends IService<QcresultInfo> {
      * @param qcresultFilterVO
      * @return
      */
-    public List<NumDTO> resultCountByDept(QcresultFilterVO qcresultFilterVO);
+    List<NumDTO> resultCountByDept(QcresultFilterVO qcresultFilterVO);
 
     /**
      * 各模块缺陷占比-按科室
@@ -91,7 +91,7 @@ public interface QcresultInfoService extends IService<QcresultInfo> {
      * @param filterVO
      * @return
      */
-    public List<DeptNumDTO> entryCountGroupByCaseAndDept(FilterVO filterVO);
+    List<DeptNumDTO> entryCountGroupByCaseAndDept(FilterVO filterVO);
 
     /**
      * 条目缺陷占比-按科室
@@ -99,7 +99,7 @@ public interface QcresultInfoService extends IService<QcresultInfo> {
      * @param filterVO
      * @return
      */
-    public List<DeptNumDTO> entryCountGroupByEntryAndDept(FilterVO filterVO);
+    List<DeptNumDTO> entryCountGroupByEntryAndDept(FilterVO filterVO);
 
     /**
      * 各模块缺陷占比（分页）
@@ -107,7 +107,7 @@ public interface QcresultInfoService extends IService<QcresultInfo> {
      * @param filterPageVO
      * @return
      */
-    public IPage<NumDTO> entryCountGroupByCasePage(@Param("filterPageVO") FilterPageVO filterPageVO);
+    IPage<NumDTO> entryCountGroupByCasePage(@Param("filterPageVO") FilterPageVO filterPageVO);
 
     /**
      * 缺陷详情（分页）
@@ -115,7 +115,7 @@ public interface QcresultInfoService extends IService<QcresultInfo> {
      * @param filterPageVO
      * @return
      */
-    public IPage<EntryNumDTO> entryCountGroupByEntryPage(@Param("filterPageVO") FilterPageVO filterPageVO);
+    IPage<EntryNumDTO> entryCountGroupByEntryPage(@Param("filterPageVO") FilterPageVO filterPageVO);
 
     /**
      * 各科室质控平均分（分页）
@@ -123,7 +123,7 @@ public interface QcresultInfoService extends IService<QcresultInfo> {
      * @param filterPageVO
      * @return
      */
-    public IPage<AverageStatisticsDTO> getAverageScoreByDeptPage(@Param("filterPageVO") FilterPageVO filterPageVO);
+    IPage<AverageStatisticsDTO> getAverageScoreByDeptPage(@Param("filterPageVO") FilterPageVO filterPageVO);
 
     /**
      * 各科室甲级病历占比排行（分页）
@@ -131,7 +131,7 @@ public interface QcresultInfoService extends IService<QcresultInfo> {
      * @param filterPageVO
      * @return
      */
-    public IPage<QcResultPercentDTO> levelPercentGroupByDeptPage(@Param("filterPageVO") FilterPageVO filterPageVO);
+    IPage<QcResultPercentDTO> levelPercentGroupByDeptPage(@Param("filterPageVO") FilterPageVO filterPageVO);
 
     /**
      * 各模块缺陷占比-科室（分页）
@@ -139,7 +139,7 @@ public interface QcresultInfoService extends IService<QcresultInfo> {
      * @param filterPageByDeptVO
      * @return
      */
-    public IPage<DeptNumDTO> entryCountGroupByCaseAndDeptPage(@Param("filterPageByDeptVO") FilterPageByDeptVO filterPageByDeptVO);
+    IPage<DeptNumDTO> entryCountGroupByCaseAndDeptPage(@Param("filterPageByDeptVO") FilterPageByDeptVO filterPageByDeptVO);
 
     /**
      * 缺陷详情-科室（分页）
@@ -147,14 +147,14 @@ public interface QcresultInfoService extends IService<QcresultInfo> {
      * @param filterPageByDeptVO
      * @return
      */
-    public IPage<DeptEntryNumDTO> entryCountGroupByEntryAndDeptPage(@Param("filterPageByDeptVO") FilterPageByDeptVO filterPageByDeptVO);
+    IPage<DeptEntryNumDTO> entryCountGroupByEntryAndDeptPage(@Param("filterPageByDeptVO") FilterPageByDeptVO filterPageByDeptVO);
 
     /**
      * 条目缺陷占比（内页）
      *
      * @return
      */
-    public IPage<EntryNumDTO> entryGroupByEntryInnerPage(@Param("filterPageVO") FilterPageVO filterPageVO);
+    IPage<EntryNumDTO> entryGroupByEntryInnerPage(@Param("filterPageVO") FilterPageVO filterPageVO);
 
     /**
      * 条目缺陷占比-科室（内页）
@@ -162,7 +162,7 @@ public interface QcresultInfoService extends IService<QcresultInfo> {
      * @param filterPageByDeptVO
      * @return
      */
-    public IPage<DeptEntryNumDTO> entryGroupByEntryAndDeptInnerPage(@Param("filterPageByDeptVO") FilterPageByDeptVO filterPageByDeptVO);
+    IPage<DeptEntryNumDTO> entryGroupByEntryAndDeptInnerPage(@Param("filterPageByDeptVO") FilterPageByDeptVO filterPageByDeptVO);
 
     /**
      * 各科室质控平均分（首页）-根据内外科系统统计
@@ -170,7 +170,7 @@ public interface QcresultInfoService extends IService<QcresultInfo> {
      * @param filterVO
      * @return
      */
-    public List<AverageStatisticsDTO> getAverageScoreByDeptClass(FilterVO filterVO);
+    List<AverageStatisticsDTO> getAverageScoreByDeptClass(FilterVO filterVO);
 
     /**
      * 单项否决缺陷占比
@@ -178,7 +178,7 @@ public interface QcresultInfoService extends IService<QcresultInfo> {
      * @param filterVO
      * @return
      */
-    public List<EntryNumDTO> entryRejectPercent(FilterVO filterVO);
+    List<EntryNumDTO> entryRejectPercent(FilterVO filterVO);
 
     /**
      * 各科室甲/乙/丙级病历占比
@@ -186,5 +186,5 @@ public interface QcresultInfoService extends IService<QcresultInfo> {
      * @param filterVO
      * @return
      */
-    public List<DeptNumDTO> qcResultLevelPercent(FilterVO filterVO);
+    List<DeptNumDTO> qcResultLevelPercent(FilterVO filterVO);
 }

src/main/java/com/diagbot/service/SysMenuService.java

@@ -22,7 +22,7 @@ public interface SysMenuService extends IService<SysMenu> {
      * @Author: ztg
      * @Date: 2018/9/17 15:43
      */
-    public List<SysMenuWrapper> getByRole(Long userId);
+    List<SysMenuWrapper> getByRole(Long userId);
 
 
     /**
@@ -30,7 +30,7 @@ public interface SysMenuService extends IService<SysMenu> {
      * @Author: ztg
      * @Date: 2018/9/17 15:44
      */
-    public List<SysMenuWrapper> getSubMenuById(Long id);
+    List<SysMenuWrapper> getSubMenuById(Long id);
 
-    public List<SysUserPermissionDTO> getByRolePermission(Long userId);
+    List<SysUserPermissionDTO> getByRolePermission(Long userId);
 }

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

@@ -5,6 +5,7 @@ import org.apache.commons.codec.binary.Base64;
 import javax.crypto.*;
 import javax.crypto.spec.DESKeySpec;
 import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 import java.security.InvalidKeyException;
 
 /**
@@ -25,7 +26,7 @@ public class EncrypDES {
     private byte[] cipherByte;
 
     public EncrypDES() throws Exception {
-        DESKeySpec desKey = new DESKeySpec(key.getBytes("utf-8"));
+        DESKeySpec desKey = new DESKeySpec(key.getBytes(StandardCharsets.UTF_8));
         SecretKeyFactory keyFactory = SecretKeyFactory.getInstance("DES");
         // 生成密钥
         deskey = keyFactory.generateSecret(desKey);
@@ -46,7 +47,7 @@ public class EncrypDES {
             IllegalBlockSizeException, BadPaddingException, UnsupportedEncodingException {
         // 根据密钥，对Cipher对象进行初始化，ENCRYPT_MODE表示加密模式
         c.init(Cipher.ENCRYPT_MODE, deskey);
-        byte[] src = str.getBytes("utf-8");
+        byte[] src = str.getBytes(StandardCharsets.UTF_8);
         // 加密，结果保存进cipherByte
         cipherByte = c.doFinal(src);
         return Base64.encodeBase64String(cipherByte);
@@ -67,7 +68,7 @@ public class EncrypDES {
         // 根据密钥，对Cipher对象进行初始化，DECRYPT_MODE表示加密模式
         c.init(Cipher.DECRYPT_MODE, deskey);
         cipherByte = c.doFinal(buff);
-        return new String(cipherByte, "utf-8");
+        return new String(cipherByte, StandardCharsets.UTF_8);
     }
 }
 

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

@@ -61,7 +61,6 @@ public class ExcelUtils {
                                       ExportParams exportParams) {
         Workbook workbook = ExcelExportUtil.exportExcel(exportParams, pojoClass, list);
         if (workbook != null) {
-            ;
         }
         downLoadExcel(fileName, response, workbook);
     }
@@ -114,7 +113,6 @@ public class ExcelUtils {
     private static void defaultExport(List<Map<String, Object>> list, String fileName, HttpServletResponse response) {
         Workbook workbook = ExcelExportUtil.exportExcel(list, ExcelType.HSSF);
         if (workbook != null) {
-            ;
         }
         downLoadExcel(fileName, response, workbook);
     }

src/main/resources/mapper/PatientInfoMapper.xml

@@ -10,7 +10,7 @@
         <result column="mrn" property="mrn" />
         <result column="series" property="series" />
         <result column="name" property="name" />
-        <result column="be_hospital_date" property="be_hospitalDate" />
+        <result column="behospital_date" property="behospitalDate" />
         <result column="leave_hospital_date" property="leaveHospitalDate" />
         <result column="dept_id" property="deptId" />
         <result column="in_date" property="inDate" />

src/test/java/com/diagbot/CodeGeneration.java

@@ -56,7 +56,7 @@ public class CodeGeneration {
         StrategyConfig strategy = new StrategyConfig();
 //        strategy.setTablePrefix(new String[] { "med_" });// 此处可以修改为您的表前缀
         strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
-        strategy.setInclude(new String[] { "med_pacs_result","med_lis_result"}); // 需要生成的表
+        strategy.setInclude("med_pacs_result","med_lis_result"); // 需要生成的表
 
         strategy.setSuperServiceClass(null);
         strategy.setSuperServiceImplClass(null);