修改邵逸夫质控代码

src/main/java/com/diagbot/entity/MedLisResult.java

@@ -18,7 +18,7 @@ public class MedLisResult implements Serializable {
     /**
      * 报告单号
      */
-    private String reptNo;
+    private String repNo;
 
     /**
      * 医院ID
@@ -108,12 +108,12 @@ public class MedLisResult implements Serializable {
         this.reference = reference;
     }
 
-    public String getReptNo() {
-        return reptNo;
+    public String getRepNo() {
+        return repNo;
     }
 
-    public void setReptNo(String reptNo) {
-        this.reptNo = reptNo;
+    public void setRepNo(String repNo) {
+        this.repNo = repNo;
     }
     public Long getHospitalId() {
         return hospitalId;
@@ -224,7 +224,7 @@ public class MedLisResult implements Serializable {
     @Override
     public String toString() {
         return "MedLisResult{" +
-            "reptNo=" + reptNo +
+            "repNo=" + repNo +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +
             ", itemCode=" + itemCode +

src/main/java/com/diagbot/entity/MedPacsResult.java

@@ -18,7 +18,7 @@ public class MedPacsResult implements Serializable {
     /**
      * 报告单号
      */
-    private String reptNo;
+    private String repNo;
 
     /**
      * 医院ID
@@ -105,12 +105,12 @@ public class MedPacsResult implements Serializable {
      */
     private String modifier;
 
-    public String getReptNo() {
-        return reptNo;
+    public String getRepNo() {
+        return repNo;
     }
 
-    public void setReptNo(String reptNo) {
-        this.reptNo = reptNo;
+    public void setRepNo(String repNo) {
+        this.repNo = repNo;
     }
     public Long getHospitalId() {
         return hospitalId;
@@ -235,7 +235,7 @@ public class MedPacsResult implements Serializable {
     @Override
     public String toString() {
         return "MedPacsResult{" +
-            "reptNo=" + reptNo +
+            "repNo=" + repNo +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +
             ", reptName=" + reptName +

src/main/java/com/diagbot/entity/SysUserUaa.java

@@ -101,6 +101,7 @@ public class SysUserUaa implements UserDetails, Serializable {
         return true;
     }
 
+    @Override
     @JsonIgnore
     public Collection<? extends GrantedAuthority> getAuthorities() {
         return authorities;
@@ -159,6 +160,7 @@ public class SysUserUaa implements UserDetails, Serializable {
         this.modifier = modifier;
     }
 
+    @Override
     public String getPassword() {
         return password;
     }
@@ -167,6 +169,7 @@ public class SysUserUaa implements UserDetails, Serializable {
         this.password = password;
     }
 
+    @Override
     public String getUsername() {
         return username;
     }

src/main/java/com/diagbot/exception/ServiceErrorCode.java

@@ -30,10 +30,12 @@ public enum ServiceErrorCode implements ErrorCode {
     }
 
 
+    @Override
     public String getCode() {
         return code;
     }
 
+    @Override
     public String getMsg() {
         return msg;
     }

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

@@ -358,7 +358,7 @@ public class ConsoleFacade {
      */
     public IPage<EntryNumDTO> entryCountGroupByEntryPage(FilterPageVO filterPageVO) {
         filterFacade.filterPageVOSet(filterPageVO);
-        if (filterPageVO.getDeptName().equals("全院")) {
+        if ("全院".equals(filterPageVO.getDeptName())) {
             filterPageVO.setDeptName("");
         }
         IPage<EntryNumDTO> page = qcresultInfoFacade.entryCountGroupByEntryPage(filterPageVO);
@@ -472,7 +472,7 @@ public class ConsoleFacade {
         filterFacade.filterOrderVOSet(filterOrderVO);
         List<HomePageNumDTO> records = behospitalInfoFacade.homePageLevelStatistics(filterOrderVO);
         //没有科室过滤时增加全院数据
-        if (StringUtil.isBlank(filterOrderVO.getName()) || filterOrderVO.getName().equals("全院")) {
+        if (StringUtil.isBlank(filterOrderVO.getName()) || "全院".equals(filterOrderVO.getName())) {
             HomePageNumDTO item = getGlobleRecord(records);
             if (item != null) {
                 records.add(0, item);

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

@@ -90,9 +90,9 @@ public class ADoctorAdviceFacade extends DoctorAdviceServiceImpl {
                     //doctorAdvice.setBehospitalCode(patientListResponse.getData().get(i).getMRN() + "_" + patientListResponse.getData().get(i).getSERIES());
                     doctorAdvice.setOrderDoctorName(sYFDoctorAdviceList.get(j).getDr_name());
                     doctorAdvice.setFrequency(sYFDoctorAdviceList.get(j).getFrequency_name());
-                    if (sYFDoctorAdviceList.get(j).getOrdertype().equals("S")) {
+                    if ("S".equals(sYFDoctorAdviceList.get(j).getOrdertype())) {
                         doctorAdvice.setDoctorAdviceType("临时");
-                    } else if (sYFDoctorAdviceList.get(j).getOrdertype().equals("R")) {
+                    } else if ("R".equals(sYFDoctorAdviceList.get(j).getOrdertype())) {
                         doctorAdvice.setDoctorAdviceType("长期");
                     } else {
                         doctorAdvice.setDoctorAdviceType("出院带药");
@@ -105,18 +105,29 @@ public class ADoctorAdviceFacade extends DoctorAdviceServiceImpl {
                     doctorAdvice.setDaFrequency(sYFDoctorAdviceList.get(j).getFrequency());
                     doctorAdvice.setDaStartDate(ShaoyfDateUtil.parseDateTime(sYFDoctorAdviceList.get(j).getDatestart()));
                     doctorAdvice.setDaItemName(sYFDoctorAdviceList.get(j).getDrname());
-                    doctorAdvice.setDaStatus(sYFDoctorAdviceList.get(j).getDoflag());
+                    if("0".equals(sYFDoctorAdviceList.get(j).getDoflag())){
+                        doctorAdvice.setDaStatus("新录入");
+                    }else if ("1".equals(sYFDoctorAdviceList.get(j).getDoflag())){
+                        doctorAdvice.setDaStatus("已审批/核对");
+                    }else if ("2".equals(sYFDoctorAdviceList.get(j).getDoflag())){
+                        doctorAdvice.setDaStatus("已执行");
+                    }else if ("3".equals(sYFDoctorAdviceList.get(j).getDoflag())){
+                        doctorAdvice.setDaStatus("已DC");
+                    }else if ("4".equals(sYFDoctorAdviceList.get(j).getDoflag())){
+                        doctorAdvice.setDaStatus("已停止");
+                    }
                     doctorAdvice.setDaStopDate(ShaoyfDateUtil.parseDateTime(sYFDoctorAdviceList.get(j).getDatestop()));
                     doctorAdvice.setDaGroupNo(sYFDoctorAdviceList.get(j).getSetno());
                     doctorAdvice.setDaPrescriptionType(sYFDoctorAdviceList.get(j).getOrderflag_name());
                     doctorAdvice.setDoctorNotice(sYFDoctorAdviceList.get(j).getRemark());
                     doctorAdvice.setDoctorId(sYFDoctorAdviceList.get(j).getDr());
                     doctorAdvice.setDoctorName(sYFDoctorAdviceList.get(j).getDr_name());
-                    if (sYFDoctorAdviceList.get(j).getDrugType().equals("0")) { // 0=普药 1=抗生素 2=激素
+                    // 0=普药 1=抗生素 2=激素
+                    if ("0".equals(sYFDoctorAdviceList.get(j).getDrugType())) {
                         doctorAdvice.setMedicineType("普药");
-                    } else if (sYFDoctorAdviceList.get(j).getDrugType().equals("1")) {
+                    } else if ("1".equals(sYFDoctorAdviceList.get(j).getDrugType())) {
                         doctorAdvice.setMedicineType("抗生素");
-                    } else if (sYFDoctorAdviceList.get(j).getDrugType().equals("2")) {
+                    } else if ("2".equals(sYFDoctorAdviceList.get(j).getDrugType())) {
                         doctorAdvice.setMedicineType("激素");
                     }
                     doctorAdviceList.add(doctorAdvice);

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

@@ -351,20 +351,20 @@ public class AHomePageFacade extends HomePageServiceImpl {
             String behospitalCode = aHomePageIngVO.getHomePages().get(0).getBehospitalCode();
             Long hospitalId = aHomePageIngVO.getHomePages().get(0).getHospitalId();
             Long modeId = Long.valueOf("6");//病案首页默认为6
-            if (aHomePageIngVO.getDockModeType().equals("0")) {
+            if ("0".equals(aHomePageIngVO.getDockModeType())) {
                 Map<String, Object> map = new HashMap<String, Object>();
                 List<AHomePageDTO> homePageDtoList = BeanUtil.listCopyTo(aHomePageIngVO.getHomePages(), AHomePageDTO.class);
                 map.put("homePages", homePageDtoList);
                 aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页", JSON.toJSONString(aHomePageIngVO), JSON.toJSONString(RespDTO.onSuc(map)), "操作成功!");
                 return RespDTO.onSuc(map);
-            } else if (aHomePageIngVO.getDockModeType().equals("1")) {
+            } else if ("1".equals(aHomePageIngVO.getDockModeType())) {
                 //页面模式
                 String url = readProperties.getProcessQcUrl() + "?behospitalCode=" + behospitalCode + "&hospitalId=" + hospitalId + "&modeId=" + modeId;
                 Map<String, Object> map = new HashMap<String, Object>();
                 map.put("url", url);
                 aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页", JSON.toJSONString(aHomePageIngVO), JSON.toJSONString(RespDTO.onSuc(map)), "操作成功!");
                 return RespDTO.onSuc(map);
-            } else if (aHomePageIngVO.getDockModeType().equals("2")) {
+            } else if ("2".equals(aHomePageIngVO.getDockModeType())) {
                 AnalyzeRunVO analyzeRunVO = new AnalyzeRunVO();
                 analyzeRunVO.setBehospitalCode(behospitalCode);
                 analyzeRunVO.setHospitalId(hospitalId);

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

@@ -49,7 +49,7 @@ public class AMedRecordTypeFacade extends MedRecordTypeServiceImpl {
             String a = api.doPost("http://192.1.2.31:9000/api/NlService/getEmrMbList", request);
             System.out.println(a);
             MRTypeResponse response = JSON.parseObject(a, MRTypeResponse.class);
-            if (response.getResult().equals("1") && response.getData() != null) {
+            if ("1".equals(response.getResult()) && response.getData() != null) {
                 List<SYFMedicalRecordType> sYFMedicalRecordTypeList = response.getData();
                 List<MedRecordType> medRecordTypeList = Lists.newLinkedList();
                 for (int i = 0; i < sYFMedicalRecordTypeList.size(); i++) {

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

@@ -141,7 +141,7 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
                     medicalRecordContentList.add(medicalRecordContent);
 
                     try {
-                        if (medicalRecord.getRecTitle().equals("住院病案首页（病人存档及卫生统计用）")) {
+                        if ("住院病案首页（病人存档及卫生统计用）".equals(medicalRecord.getRecTitle())) {
                             //解析html获取病案首页、首页诊断、首页手术插入数据库
                             selectDataAndSave(medicalRecordContent, medicalRecord);
                         }
@@ -473,13 +473,13 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
             MedicalRecord medicalRecord = new MedicalRecord();
             BeanUtil.copyProperties(aMrContentVO.getRecords().get(0), medicalRecord);
             Long modeId = initModeId(medicalRecord);
-            if (aMrContentVO.getDockModeType().equals("0")) {
+            if ("0".equals(aMrContentVO.getDockModeType())) {
                 Map<String, Object> map = new HashMap<String, Object>();
                 List<AMedicalRecordDTO> medicalRecordDTOList = BeanUtil.listCopyTo(aMrContentVO.getRecords(), AMedicalRecordDTO.class);
                 map.put("records", medicalRecordDTOList);
                 aMedAbnormalInfoFacade.saveAbnormalInfo("文书信息", JSON.toJSONString(aMrContentVO), JSON.toJSONString(RespDTO.onSuc(map)), "操作正常!");
                 return RespDTO.onSuc(map);
-            } else if (aMrContentVO.getDockModeType().equals("1")) {
+            } else if ("1".equals(aMrContentVO.getDockModeType())) {
                 if (modeId == 0 || modeId == null) {
                     return RespDTO.onError("无对应的文书类型");
                 }
@@ -489,7 +489,7 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
                 map.put("url", url);
                 aMedAbnormalInfoFacade.saveAbnormalInfo("文书信息", JSON.toJSONString(aMrContentVO), JSON.toJSONString(RespDTO.onSuc(map)), "操作正常!");
                 return RespDTO.onSuc(map);
-            } else if (aMrContentVO.getDockModeType().equals("2")) {
+            } else if ("2".equals(aMrContentVO.getDockModeType())) {
                 AnalyzeRunVO analyzeRunVO = new AnalyzeRunVO();
                 analyzeRunVO.setBehospitalCode(behospitalCode);
                 analyzeRunVO.setHospitalId(hospitalId);
@@ -548,7 +548,7 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
                         qcAbnormal.setDescription(s.getRecTitle());
                         qcAbnormal.setGmtCreate(new Date());
                         qcAbnormalList.add(qcAbnormal);
-                    } else if (modeId == Long.valueOf("1")) {
+                    } else if (modeId.equals(Long.valueOf("1"))) {
                         BehospitalInfo behospitalInfo = behospitalInfoFacade.getOne(new QueryWrapper<BehospitalInfo>()
                                 .eq("behospital_code", s.getBehospitalCode())
                                 .eq("hospital_id", s.getHospitalId())

src/main/java/com/diagbot/service/impl/BehospitalInfoServiceImpl.java

@@ -104,6 +104,7 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
      * @param filterVO
      * @return
      */
+    @Override
     public int leaveHosCount(FilterVO filterVO) {
         return baseMapper.leaveHosCount(filterVO);
     }
@@ -114,6 +115,7 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
      * @param filterVO
      * @return
      */
+    @Override
     public int newBornCount(FilterVO filterVO) {
         return baseMapper.newBornCount(filterVO);
     }
@@ -124,6 +126,7 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
      * @param filterVO
      * @return
      */
+    @Override
     public int deathCount(FilterVO filterVO) {
         return baseMapper.deathCount(filterVO);
     }
@@ -134,6 +137,7 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
      * @param filterVO
      * @return
      */
+    @Override
     public int operationCount(FilterVO filterVO) {
         return baseMapper.operationCount(filterVO);
     }
@@ -144,6 +148,7 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
      * @param filterVO
      * @return
      */
+    @Override
     public List<NumDTO> leaveHosCountByDept(FilterVO filterVO) {
         return baseMapper.leaveHosCountByDept(filterVO);
     }
@@ -154,6 +159,7 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
      * @param filterVO
      * @return
      */
+    @Override
     public List<NumDTO> newBornCountByDept(FilterVO filterVO) {
         return baseMapper.newBornCountByDept(filterVO);
     }
@@ -164,6 +170,7 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
      * @param filterVO
      * @return
      */
+    @Override
     public List<NumDTO> deathCountByDept(FilterVO filterVO) {
         return baseMapper.deathCountByDept(filterVO);
     }
@@ -174,6 +181,7 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
      * @param filterVO
      * @return
      */
+    @Override
     public List<NumDTO> operationCountByDept(FilterVO filterVO) {
         return baseMapper.operationCountByDept(filterVO);
     }
@@ -239,6 +247,7 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
      * @param filterPageByDeptVO
      * @return
      */
+    @Override
     public IPage<DeptNumDTO> resultStatisticsByDeptAndDoctorPage(@Param("filterPageByDeptVO") FilterPageByDeptVO filterPageByDeptVO) {
         return baseMapper.resultStatisticsByDeptAndDoctorPage(filterPageByDeptVO);
     }
@@ -276,6 +285,7 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
      * @param exportQcresultVO
      * @return
      */
+    @Override
     public List<ExportExcelDTO> exportQcresult(ExportQcresultVO exportQcresultVO) {
         return baseMapper.exportQcresult(exportQcresultVO);
     }
@@ -286,6 +296,7 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
      * @param exportQcresultVO
      * @return
      */
+    @Override
     public List<ExportExcelDTO> exportQcresultByDept(ExportQcresultVO exportQcresultVO) {
         return baseMapper.exportQcresultByDept(exportQcresultVO);
     }
@@ -301,6 +312,7 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
      * @param qcResultShortPageVO
      * @return
      */
+    @Override
     public IPage<QcResultShortDTO> qcResultShortPage(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO) {
         return baseMapper.qcResultShortPage(qcResultShortPageVO);
     }
@@ -311,6 +323,7 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
      * @param qcResultShortPageVO
      * @return
      */
+    @Override
     public IPage<QcResultShortDTO> qcResultShortByDeptPage(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO) {
         return baseMapper.qcResultShortByDeptPage(qcResultShortPageVO);
     }

src/main/java/com/diagbot/service/impl/ExcelExportStylerUserImpl.java

@@ -18,6 +18,7 @@ public class ExcelExportStylerUserImpl extends AbstractExcelExportStyler impleme
         super.createStyles(workbook);
     }
 
+    @Override
     public CellStyle getTitleStyle(short color) {
         CellStyle titleStyle = this.workbook.createCellStyle();
         titleStyle.setAlignment(HorizontalAlignment.CENTER);
@@ -26,6 +27,7 @@ public class ExcelExportStylerUserImpl extends AbstractExcelExportStyler impleme
         return titleStyle;
     }
 
+    @Override
     public CellStyle stringSeptailStyle(Workbook workbook, boolean isWarp) {
         CellStyle style = workbook.createCellStyle();
         style.setAlignment(HorizontalAlignment.CENTER);
@@ -40,6 +42,7 @@ public class ExcelExportStylerUserImpl extends AbstractExcelExportStyler impleme
         return style;
     }
 
+    @Override
     public CellStyle getHeaderStyle(short color) {
         CellStyle titleStyle = this.workbook.createCellStyle();
         Font font = this.workbook.createFont();
@@ -50,6 +53,7 @@ public class ExcelExportStylerUserImpl extends AbstractExcelExportStyler impleme
         return titleStyle;
     }
 
+    @Override
     public CellStyle stringNoneStyle(Workbook workbook, boolean isWarp) {
         CellStyle style = workbook.createCellStyle();
         style.setAlignment(HorizontalAlignment.CENTER);

src/main/java/com/diagbot/service/impl/HomePageServiceImpl.java

@@ -63,6 +63,7 @@ public class HomePageServiceImpl extends ServiceImpl<HomePageMapper, HomePage> i
      * @param filterPageByAverageVO
      * @return
      */
+    @Override
     public IPage<AverageStatisticsDTO> getAverageFeePage(@Param("filterPageByAverageVO") FilterPageByAverageVO filterPageByAverageVO) {
         return baseMapper.getAverageFeePage(filterPageByAverageVO);
     }

src/main/java/com/diagbot/service/impl/QcAbnormalServiceImpl.java

@@ -19,6 +19,7 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class QcAbnormalServiceImpl extends ServiceImpl<QcAbnormalMapper, QcAbnormal> implements QcAbnormalService {
+    @Override
     public IPage<QcAbnormalDTO> getQcAnnormal(QcAbnormalVO qcAbnormalVO){
         return baseMapper.getQcAnnormal(qcAbnormalVO);
     }

src/main/java/com/diagbot/service/impl/QcCasesHospitalServiceImpl.java

@@ -19,6 +19,7 @@ import java.util.List;
  */
 @Service
 public class QcCasesHospitalServiceImpl extends ServiceImpl<QcCasesHospitalMapper, QcCasesHospital> implements QcCasesHospitalService {
+    @Override
     public void updateBatch(List<QcCasesSaveVO> qcCasesSaveVOList){
         baseMapper.updateBatch(qcCasesSaveVOList);
         return;

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

@@ -26,7 +26,7 @@ public class ShaoyfDateUtil {
                 datetime = datetime.substring(0, datetime.length() - 1);
             }
 
-            if (datetime.length() > 0 && !datetime.equals("-")) {
+            if (datetime.length() > 0 && !"-".equals(datetime)) {
                 date = DateUtils.parseDate(datetime, dateFormats);
             }
         } catch (ParseException ex) {

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

@@ -47,7 +47,7 @@ public class ShaoyfHtmlUtil {
         tableElements.get(4).getElementsByAttributeValue("token", "term").forEach(spanElement -> {
             String comment = spanElement.attr("Comment");
             String text = spanElement.text().replaceAll(" ", "");
-            if (comment.equals("新生儿年龄")) {
+            if ("新生儿年龄".equals(comment)) {
                 comment = comment + spanElement.nextElementSibling().text();
             }
             otherPageMap.put(comment, text);
@@ -56,7 +56,7 @@ public class ShaoyfHtmlUtil {
         tableElements.get(12).getElementsByAttributeValue("token", "term").forEach(spanElement -> {
             String comment = spanElement.attr("Comment");
             String text = spanElement.text().replaceAll(" ", "");
-            if (comment.equals("ICD10")) {
+            if ("ICD10".equals(comment)) {
                 otherPageMap.put("门急诊诊断编码", text);
             } else {
                 otherPageMap.put("门急诊诊断", text);
@@ -66,7 +66,7 @@ public class ShaoyfHtmlUtil {
         tableElements.get(14).getElementsByAttributeValue("token", "term").forEach(spanElement -> {
             String comment = spanElement.attr("Comment");
             String text = spanElement.text().replaceAll(" ", "");
-            if (comment.equals("ICD10")) {
+            if ("ICD10".equals(comment)) {
                 otherPageMap.put("损伤中毒因素编码", text);
             } else {
                 otherPageMap.put("损伤中毒因素", text);
@@ -76,9 +76,9 @@ public class ShaoyfHtmlUtil {
         tableElements.get(15).getElementsByAttributeValue("token", "term").forEach(spanElement -> {
             String comment = spanElement.attr("Comment");
             String text = spanElement.text().replaceAll(" ", "");
-            if (comment.equals("ICD10")) {
+            if ("ICD10".equals(comment)) {
                 otherPageMap.put("病理诊断编码", text);
-            } else if (comment.equals("病理号")) {
+            } else if ("病理号".equals(comment)) {
                 otherPageMap.put("病理诊断编号", text);
             } else {
                 otherPageMap.put("病理诊断", text);
@@ -102,7 +102,7 @@ public class ShaoyfHtmlUtil {
         for (int i = 0; i < spanTexts.size(); i++) {
             spanText = spanTexts.get(i).replaceAll("&nbsp;", "");
             if (i % 3 == 0) {
-                if (!spanText.equals("")) {
+                if (!"".equals(spanText)) {
                     diagMap = new HashMap<>();
                     diagMap.put("诊断名称", spanText);
                 } else {
@@ -135,7 +135,7 @@ public class ShaoyfHtmlUtil {
                         spanElement.text().replaceAll("&nbsp;", "")
                 );
             });
-            if (!operMap.get("手术名称").equals("")) {
+            if (!"".equals(operMap.get("手术名称"))) {
                 operMaps.add(operMap);
             }
         }

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

@@ -254,7 +254,7 @@ public class TZDBConn {
 				homePageVO.setName(rs.getString("BRBAXM"));//姓名
 				homePageVO.setSex(rs.getString("BRBAXB"));//性别
 				homePageVO.setBirthday(rs.getDate("BRCSRQ"));//出生日期
-				homePageVO.setAge(rs.getString("BRDQNL").equals("-")?null:rs.getString("BRDQNL"));//病人年龄
+				homePageVO.setAge("-".equals(rs.getString("BRDQNL")) ?null:rs.getString("BRDQNL"));//病人年龄
 				homePageVO.setAgeUnit(rs.getString("BRNLDW"));//年龄单位
 				homePageVO.setNationality(rs.getString("BRBAGJ"));//国籍
 				homePageVO.setNewbornMonth(rs.getString("YENLYS"));//新生儿出生月数
@@ -523,7 +523,7 @@ public class TZDBConn {
 				behospitalInfo.setBehospitalCode(rs.getString("BRZYID"));//病人住院ID
 				behospitalInfo.setHospitalId(HOSPITAL_ID);//医院ID
 				behospitalInfo.setName(rs.getString("BRDAXM"));//姓名
-				behospitalInfo.setSex(rs.getString("BRDAXB").equals("M")?"男":"女");//性别
+				behospitalInfo.setSex("M".equals(rs.getString("BRDAXB")) ?"男":"女");//性别
 				behospitalInfo.setBirthday(rs.getDate("BRCSRQ"));//出生日期
 				behospitalInfo.setFileCode(rs.getString("BRDABH"));//档案号
 				behospitalInfo.setWardCode(rs.getString("ZYBQID"));//病区编码

src/main/resources/mapper/MedLisResultMapper.xml

@@ -4,7 +4,7 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.diagbot.entity.MedLisResult">
-        <id column="rept_no" property="reptNo" />
+        <id column="rep_no" property="repNo" />
         <result column="hospital_id" property="hospitalId" />
         <result column="behospital_code" property="behospitalCode" />
         <result column="item_code" property="itemCode" />
@@ -44,7 +44,7 @@
                     modifier = #{item.modifier},
                 </if>
             </set>
-            where rept_no = #{item.reptNo} and hospital_id = #{item.hospitalId}
+            where rep_no = #{item.repNo} and hospital_id = #{item.hospitalId}
         </foreach>
     </update>
 

src/main/resources/mapper/MedPacsResultMapper.xml

@@ -4,7 +4,7 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.diagbot.entity.MedPacsResult">
-        <id column="rept_no" property="reptNo" />
+        <id column="rep_no" property="repNo" />
         <result column="hospital_id" property="hospitalId" />
         <result column="behospital_code" property="behospitalCode" />
         <result column="rept_name" property="reptName" />
@@ -46,7 +46,7 @@
                     modifier = #{item.modifier},
                 </if>
             </set>
-            where rept_no = #{item.reptNo} and hospital_id = #{item.hospitalId}
+            where rep_no = #{item.repNo} and hospital_id = #{item.hospitalId}
         </foreach>
     </update>