修复

src/main/java/thyyxxk/webserver/controller/inpatient/casefrontsheet/CaseFrontSheetController.java

@@ -52,12 +52,12 @@ public class CaseFrontSheetController {
     }
 
     @GetMapping("/getPatientOverview")
-    public ResultVo<List<CaseFrontsheetDisdiag.SheetOverview>> getPatientOverview(String ward) {
+    public ResultVo<List<SheetOverview>> getPatientOverview(String ward) {
         return service.getPatientOverview(ward);
     }
 
     @PostMapping("/outPatients")
-    public ResultVo<List<CaseFrontsheetDisdiag.SheetOverview>> getOutPatients(@RequestBody DismissedSheetInquiry param) {
+    public ResultVo<List<SheetOverview>> getOutPatients(@RequestBody DismissedSheetInquiry param) {
         return service.getOutPatient(param);
     }
 
@@ -67,7 +67,7 @@ public class CaseFrontSheetController {
     }
 
     @PostMapping("/getSheetInfo")
-    public ResultVo<CaseFrontsheetMain> getPatientInfo(@RequestBody CaseFrontsheetDisdiag.SheetOverview overview) {
+    public ResultVo<CaseFrontsheetMain> getPatientInfo(@RequestBody SheetOverview overview) {
         return service.getPatientInfo(overview);
     }
 
@@ -106,7 +106,7 @@ public class CaseFrontSheetController {
     }
 
     @PostMapping("/advanceSearch")
-    public ResultVo<List<CaseFrontsheetDisdiag.SheetOverview>> advanceSearch(@RequestBody AdvanceSearch param) {
+    public ResultVo<List<SheetOverview>> advanceSearch(@RequestBody AdvanceSearch param) {
         return service.advanceSearch(param);
     }
 
@@ -144,7 +144,7 @@ public class CaseFrontSheetController {
 
     @PassToken
     @PostMapping("/sheetVerification")
-    public ResultVo<Map<String, List<CodeName>>> sheetVerification(@RequestBody CaseFrontsheetDisdiag.SheetOverview view) {
+    public ResultVo<Map<String, List<CodeName>>> sheetVerification(@RequestBody SheetOverview view) {
         return service.sheetVerification(view);
     }
 }

src/main/java/thyyxxk/webserver/dao/his/inpatient/casefrontsheet/BasSelectOverviewDao.java

@@ -5,9 +5,9 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
-import thyyxxk.webserver.entity.casefrontsheet.CaseFrontsheetDisdiag;
 import thyyxxk.webserver.entity.casefrontsheet.CaseFrontsheetSurgery;
 import thyyxxk.webserver.entity.casefrontsheet.request.DismissedSheetInquiry;
+import thyyxxk.webserver.entity.casefrontsheet.request.SheetOverview;
 
 import java.util.List;
 
@@ -32,7 +32,7 @@ public interface BasSelectOverviewDao extends BaseMapper<CaseFrontsheetSurgery>
             "a.dis_date>=#{start} and " +
             "a.dis_date<=#{end} and " +
             "isnull(a.file_status, 0)!=1 order by a.zk_ward,b.zyys")
-    List<CaseFrontsheetDisdiag.SheetOverview> selectPatientsForBasByBah(DismissedSheetInquiry param);
+    List<SheetOverview> selectPatientsForBasByBah(DismissedSheetInquiry param);
 
     @Select("select count(1) from zy_actpatient where inpatient_no=#{bah} ")
     int selectInHospCount(String bah);
@@ -44,7 +44,7 @@ public interface BasSelectOverviewDao extends BaseMapper<CaseFrontsheetSurgery>
             "dismiss_date as disDate from t_case_frontsheet_main with(nolock) " +
             "where bah=#{bah} and file_status=#{fileStatus} and dismiss_date>=#{start} and " +
             "dismiss_date<=#{end} order by admiss_dept,admiss_doctor")
-    List<CaseFrontsheetDisdiag.SheetOverview> selectPatientsFromSignedBase(DismissedSheetInquiry param);
+    List<SheetOverview> selectPatientsFromSignedBase(DismissedSheetInquiry param);
 
     @Select("select " +
             "fileStatus=0, " +
@@ -68,7 +68,7 @@ public interface BasSelectOverviewDao extends BaseMapper<CaseFrontsheetSurgery>
             "a.zk_ward = #{ward} and " +
             "isnull(a.file_status, 0)!=1 and " +
             "charindex('$',a.inpatient_no)=0 order by a.zk_ward,b.zyys")
-    List<CaseFrontsheetDisdiag.SheetOverview> selectPatientsForBasByWard(DismissedSheetInquiry param);
+    List<SheetOverview> selectPatientsForBasByWard(DismissedSheetInquiry param);
 
     @Select("select sign_date,file_status,bah,admiss_times as times, " +
             "name,sex,admiss_date,dismiss_dept as deptName,admiss_doctor_name as doctorName, " +
@@ -76,7 +76,7 @@ public interface BasSelectOverviewDao extends BaseMapper<CaseFrontsheetSurgery>
             "dismiss_date as disDate from t_case_frontsheet_main with(nolock) " +
             "where dismiss_date>=#{start} and dismiss_date<=#{end} and file_status=#{fileStatus} " +
             "and dismiss_dept_code=#{ward} order by dismiss_dept, admiss_doctor")
-    List<CaseFrontsheetDisdiag.SheetOverview> selectPatientsForBasByWard2(DismissedSheetInquiry param);
+    List<SheetOverview> selectPatientsForBasByWard2(DismissedSheetInquiry param);
 
     @Select("select " +
             "fileStatus=0, " +
@@ -98,7 +98,7 @@ public interface BasSelectOverviewDao extends BaseMapper<CaseFrontsheetSurgery>
             "a.dis_date<=#{end} and " +
             "isnull(a.file_status, 0)!=1 and " +
             "charindex('$',a.inpatient_no)=0 order by a.zk_ward,b.zyys")
-    List<CaseFrontsheetDisdiag.SheetOverview> selectPatientsForBasByFileStatus(DismissedSheetInquiry param);
+    List<SheetOverview> selectPatientsForBasByFileStatus(DismissedSheetInquiry param);
 
     @Select("select sign_date,file_status,bah,admiss_times as times," +
             "name,sex,admiss_date,dismiss_dept as deptName,admiss_doctor_name as doctorName," +
@@ -106,7 +106,7 @@ public interface BasSelectOverviewDao extends BaseMapper<CaseFrontsheetSurgery>
             "dismiss_date as disDate from t_case_frontsheet_main with(nolock) " +
             "where dismiss_date>=#{start} and dismiss_date<=#{end} and " +
             "file_status=#{fileStatus} order by trans_dept,admiss_doctor")
-    List<CaseFrontsheetDisdiag.SheetOverview> selectPatientsForBasByFileStatus2(DismissedSheetInquiry param);
+    List<SheetOverview> selectPatientsForBasByFileStatus2(DismissedSheetInquiry param);
 
     @Update("update zy_actpatient set file_status=#{status} where inpatient_no=#{bah} and admiss_times=#{times};" +
             "update zy_inactpatient set file_status=#{status} where inpatient_no=#{bah} and admiss_times=#{times};")

src/main/java/thyyxxk/webserver/dao/his/inpatient/casefrontsheet/CaseFrontSheetDao.java

@@ -5,6 +5,7 @@ import org.apache.ibatis.annotations.*;
 import thyyxxk.webserver.entity.casefrontsheet.*;
 import thyyxxk.webserver.entity.casefrontsheet.request.AdvanceSearch;
 import thyyxxk.webserver.entity.casefrontsheet.request.DismissedSheetInquiry;
+import thyyxxk.webserver.entity.casefrontsheet.request.SheetOverview;
 import thyyxxk.webserver.entity.covid.Region;
 import thyyxxk.webserver.entity.dictionary.CodeName;
 import thyyxxk.webserver.entity.dictionary.HisWjwMatchEntity;
@@ -26,14 +27,14 @@ public interface CaseFrontSheetDao extends BaseMapper<CaseFrontsheetMain> {
             "admiss_date from zy_actpatient with(nolock) where charindex('$',inpatient_no)=0 and " +
             "(small_dept=#{ward} or ward=#{ward} or zk_ward=#{ward} or zk_dept=#{ward}) " +
             "ORDER BY cast(bed_no AS int)")
-    List<CaseFrontsheetDisdiag.SheetOverview> getPatientOverview(@Param("ward") String ward);
+    List<SheetOverview> getPatientOverview(@Param("ward") String ward);
 
     @Select("select bedNo=rtrim(bed_no),bah=rtrim(inpatient_no),times=rtrim(admiss_times),name=rtrim(name),sex," +
             "file_status,doctorName=(select rtrim(name) from a_employee_mi with(nolock) where code=refer_physician) " +
             "from zy_inactpatient with(nolock) where dis_date>=#{start} and dis_date<=#{end} and " +
             "(small_dept=#{ward} or ward=#{ward} or zk_ward=#{ward} or zk_dept=#{ward}) and " +
             "charindex('$',inpatient_no)=0 ORDER BY cast(bed_no AS int)")
-    List<CaseFrontsheetDisdiag.SheetOverview> getOutPatients(DismissedSheetInquiry param);
+    List<SheetOverview> getOutPatients(DismissedSheetInquiry param);
 
     @Select("select healthCardNo=rtrim(health_card_no),bah=rtrim(inpatient_no),name=rtrim(name),sex=rtrim(sex), " +
             "birthDate=birth_date,country=rtrim(country),birthPlace=rtrim(birth_place),nation=rtrim(nation_code), " +
@@ -531,7 +532,7 @@ public interface CaseFrontSheetDao extends BaseMapper<CaseFrontsheetMain> {
             "d.bah=a.bah and " +
             "d.times=a.admiss_times " +
             "</script>")
-    List<CaseFrontsheetDisdiag.SheetOverview> advanceSearch(AdvanceSearch param);
+    List<SheetOverview> advanceSearch(AdvanceSearch param);
 
     @Select("select file_status from t_case_frontsheet_main with(nolock) where bah=#{bah} and admiss_times=#{admissTimes}")
     Integer selectFileStatus(@Param("bah") String bah,

src/main/java/thyyxxk/webserver/entity/casefrontsheet/request/SheetOverview.java

@@ -0,0 +1,58 @@
+package thyyxxk.webserver.entity.casefrontsheet.request;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+public class SheetOverview {
+    private Integer fileStatus;
+    private Integer inOutFlag;
+    private String bedNo;
+    private String bah;
+    private Integer times;
+    private String name;
+    private Integer sex;
+    private String genderName;
+    private Date admissDate;
+    private String deptName;
+    private String doctorName;
+    private Date disDate;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date signDate;
+    private Integer lateDays;
+    private Integer lateFlag;
+
+    public Integer getLateDays() {
+        if (null == lateDays) return 0;
+        return Math.max(lateDays - 8, 0);
+    }
+
+    public String getGenderName() {
+        if (null == sex) {
+            return "未填写";
+        }
+        if (sex == 1) {
+            return "男";
+        }
+        if (sex == 2) {
+            return "女";
+        }
+        return "未知";
+    }
+
+    public Integer getLateFlag() {
+        return null == lateFlag ? 0 : lateFlag;
+    }
+
+    public Integer getFileStatus() {
+        return null == fileStatus ? 0 : fileStatus;
+    }
+
+    public Integer getInOutFlag() {
+        return null == inOutFlag ? 1 : inOutFlag;
+    }
+}

src/main/java/thyyxxk/webserver/entity/casefrontsheet/response/SheetOverviewForBas.java

@@ -1,12 +1,12 @@
 package thyyxxk.webserver.entity.casefrontsheet.response;
 
 import lombok.Data;
-import thyyxxk.webserver.entity.casefrontsheet.CaseFrontsheetDisdiag;
+import thyyxxk.webserver.entity.casefrontsheet.request.SheetOverview;
 
 import java.util.List;
 
 @Data
 public class SheetOverviewForBas {
     private String cdPercentage;
-    private List<CaseFrontsheetDisdiag.SheetOverview> list;
+    private List<SheetOverview> list;
 }

src/main/java/thyyxxk/webserver/service/inpatient/casefrontsheet/CaseFrontSheetMainService.java

@@ -20,10 +20,7 @@ import thyyxxk.webserver.dao.his.inpatient.casefrontsheet.SheetCreatedDao;
 import thyyxxk.webserver.entity.ResultVo;
 import thyyxxk.webserver.entity.api.forpowersi.drgdip.frontsheetqualitycheck.QualityCheckParams;
 import thyyxxk.webserver.entity.casefrontsheet.*;
-import thyyxxk.webserver.entity.casefrontsheet.request.AdvanceSearch;
-import thyyxxk.webserver.entity.casefrontsheet.request.DismissedSheetInquiry;
-import thyyxxk.webserver.entity.casefrontsheet.request.OpCaseFrontsheet;
-import thyyxxk.webserver.entity.casefrontsheet.request.SaveYbDiag;
+import thyyxxk.webserver.entity.casefrontsheet.request.*;
 import thyyxxk.webserver.entity.casefrontsheet.response.SheetOverviewForBas;
 import thyyxxk.webserver.entity.covid.Region;
 import thyyxxk.webserver.entity.dictionary.CodeName;
@@ -126,11 +123,11 @@ public class CaseFrontSheetMainService {
         return ResultVoUtil.success(createdDao.getAllWards());
     }
 
-    public ResultVo<List<CaseFrontsheetDisdiag.SheetOverview>> getPatientOverview(String ward) {
+    public ResultVo<List<SheetOverview>> getPatientOverview(String ward) {
         return ResultVoUtil.success(dao.getPatientOverview(ward));
     }
 
-    public ResultVo<List<CaseFrontsheetDisdiag.SheetOverview>> getOutPatient(DismissedSheetInquiry param) {
+    public ResultVo<List<SheetOverview>> getOutPatient(DismissedSheetInquiry param) {
         param.setEnd(param.getEnd() + " 23:59:59");
         if (StringUtil.isBlank(param.getWard())) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "请选择科室！");
@@ -161,8 +158,8 @@ public class CaseFrontSheetMainService {
         if (StringUtil.notBlank(param.getEnd())) {
             param.setEnd(param.getEnd() + " 23:59:59");
         }
-        List<CaseFrontsheetDisdiag.SheetOverview> baseList;
-        List<CaseFrontsheetDisdiag.SheetOverview> seedList;
+        List<SheetOverview> baseList;
+        List<SheetOverview> seedList;
         if (StringUtil.notBlank(param.getBah())) {
             baseList = basDao.selectPatientsFromSignedBase(param);
             seedList = basDao.selectPatientsForBasByBah(param);
@@ -198,8 +195,8 @@ public class CaseFrontSheetMainService {
         return ResultVoUtil.success(response);
     }
 
-    private List<CaseFrontsheetDisdiag.SheetOverview> removeDuplicateData(List<CaseFrontsheetDisdiag.SheetOverview> baseList,
-                                                                          List<CaseFrontsheetDisdiag.SheetOverview> seedList) {
+    private List<SheetOverview> removeDuplicateData(List<SheetOverview> baseList,
+                                                                          List<SheetOverview> seedList) {
         if (baseList.isEmpty()) {
             return seedList;
         }
@@ -207,7 +204,7 @@ public class CaseFrontSheetMainService {
             return baseList;
         }
         Map<String, Integer> map = new HashMap<>(seedList.size());
-        for (CaseFrontsheetDisdiag.SheetOverview overview : seedList) {
+        for (SheetOverview overview : seedList) {
             String key = overview.getBah().trim() + "-" + overview.getTimes();
             map.put(key, 1);
         }
@@ -216,7 +213,7 @@ public class CaseFrontSheetMainService {
         return baseList;
     }
 
-    public ResultVo<CaseFrontsheetMain> getPatientInfo(CaseFrontsheetDisdiag.SheetOverview overview) {
+    public ResultVo<CaseFrontsheetMain> getPatientInfo(SheetOverview overview) {
         String bah = overview.getBah();
         Integer times = overview.getTimes();
         StandardAddressMember standardAddressMember = getStandardAddressMember(bah);
@@ -803,7 +800,7 @@ public class CaseFrontSheetMainService {
         return map;
     }
 
-    public ResultVo<Map<String, List<CodeName>>> sheetVerification(CaseFrontsheetDisdiag.SheetOverview view) {
+    public ResultVo<Map<String, List<CodeName>>> sheetVerification(SheetOverview view) {
         if (StringUtil.isBlank(view.getBah()) || null == view.getTimes() || null == view.getInOutFlag()) {
             return ResultVoUtil.fail(ExceptionEnum.NULL_POINTER, "住院号、住院次数、在院状态不能为空。");
         }
@@ -855,7 +852,7 @@ public class CaseFrontSheetMainService {
         return ResultVoUtil.success();
     }
 
-    public ResultVo<List<CaseFrontsheetDisdiag.SheetOverview>> advanceSearch(AdvanceSearch param) {
+    public ResultVo<List<SheetOverview>> advanceSearch(AdvanceSearch param) {
         return ResultVoUtil.success(dao.advanceSearch(param));
     }
 

src/main/java/thyyxxk/webserver/service/medicalinsurance/SetlListUpldService.java

@@ -40,6 +40,7 @@ import thyyxxk.webserver.entity.HeadInfo;
 import thyyxxk.webserver.entity.ResultVo;
 import thyyxxk.webserver.entity.casefrontsheet.CaseFrontsheetDisdiag;
 import thyyxxk.webserver.entity.casefrontsheet.CaseFrontsheetMain;
+import thyyxxk.webserver.entity.casefrontsheet.request.SheetOverview;
 import thyyxxk.webserver.entity.datamodify.GetDropdownBox;
 import thyyxxk.webserver.entity.datamodify.TYbSetModifyTime;
 import thyyxxk.webserver.entity.datamodify.TYbSetlModifyReq;
@@ -520,7 +521,7 @@ public class SetlListUpldService {
      * @param: times
      **/
     public void covertCaseFrontsheetMain2SetlinfoUpld(SetlinfoUpld setlinfoUpld, String patNo, Integer times) {
-        CaseFrontsheetDisdiag.SheetOverview overview = new CaseFrontsheetDisdiag.SheetOverview();
+        SheetOverview overview = new SheetOverview();
         overview.setInOutFlag(2);
         overview.setBah(patNo);
         overview.setTimes(times);
@@ -2523,7 +2524,7 @@ public class SetlListUpldService {
      * @return: thyyxxk.webserver.entity.ResultVo<java.lang.String>
      **/
     public ResultVo<Map<String, List<CodeName>>> sheetVerification(ZyInactpatient param) {
-        CaseFrontsheetDisdiag.SheetOverview sheetOverview = new CaseFrontsheetDisdiag.SheetOverview();
+        SheetOverview sheetOverview = new SheetOverview();
         sheetOverview.setBah(param.getInpatientNo());
         sheetOverview.setTimes(param.getAdmissTimes());
         sheetOverview.setInOutFlag(2);

src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/YiZhuLuRuServer.java

@@ -18,7 +18,7 @@ import thyyxxk.webserver.constants.sidicts.ChargeStatus;
 import thyyxxk.webserver.dao.his.zhuyuanyisheng.YiZhuLuRuDao;
 import thyyxxk.webserver.entity.ResultVo;
 import thyyxxk.webserver.entity.RoleCode;
-import thyyxxk.webserver.entity.casefrontsheet.CaseFrontsheetDisdiag;
+import thyyxxk.webserver.entity.casefrontsheet.request.SheetOverview;
 import thyyxxk.webserver.entity.datamodify.GetDropdownBox;
 import thyyxxk.webserver.entity.datamodify.SelectV2;
 import thyyxxk.webserver.entity.datamodify.YzActOrder;
@@ -313,7 +313,7 @@ public class YiZhuLuRuServer {
             return;
         }
         if (dao.selectDischargeOrde(param, TokenUtil.getInstance().getTokenUserId()) > 0) {
-            CaseFrontsheetDisdiag.SheetOverview overview = new CaseFrontsheetDisdiag.SheetOverview();
+            SheetOverview overview = new SheetOverview();
             overview.setBah(param.getInpatientNo());
             overview.setTimes(param.getAdmissTimes());
             overview.setInOutFlag(1);

src/main/java/thyyxxk/webserver/utils/FrontSheetUtil.java

@@ -3,7 +3,6 @@ package thyyxxk.webserver.utils;
 import thyyxxk.webserver.entity.api.forpowersi.drgdip.frontsheetqualitycheck.QualityCheckBaseInfo;
 import thyyxxk.webserver.entity.api.forpowersi.drgdip.frontsheetqualitycheck.QualityCheckDiseInfo;
 import thyyxxk.webserver.entity.api.forpowersi.drgdip.frontsheetqualitycheck.QualityCheckOprtInfo;
-import thyyxxk.webserver.entity.casefrontsheet.CaseFrontsheetDisdiag;
 import thyyxxk.webserver.entity.casefrontsheet.CaseFrontsheetMain;
 import thyyxxk.webserver.entity.casefrontsheet.CaseFrontsheetSurgery;
 import thyyxxk.webserver.entity.dictionary.CodeName;