Browse Source

修复首页签收问题

lighter 2 years ago
parent
commit
686c33a243

+ 0 - 6
src/main/java/thyyxxk/webserver/dao/his/casefrontsheet/BasSelectOverviewDao.java

@@ -43,12 +43,6 @@ public interface BasSelectOverviewDao extends BaseMapper<CaseFrontsheetSurgery>
             "dismiss_date<=#{end} order by admiss_dept,admiss_doctor")
     List<SheetOverview> selectPatientsFromSignedBase(GetOutSheet param);
 
-    @Select("select sign_datetime as signDate,bah,times,name,gender as sex,status as fileStatus, " +
-            "doctorName=(select rtrim(name) from a_employee_mi with(nolock) where code=apply_staff) " +
-            "from t_frontsheet_sign_apply with(nolock) " +
-            "where bah=#{bah} and status=#{status}")
-    List<SheetOverview> selectSignApply(@Param("bah") String bah, @Param("status") int status);
-
     @Select("select " +
             "fileStatus=0, " +
             "bedNo=rtrim(a.bed_no), " +

+ 1 - 1
src/main/java/thyyxxk/webserver/dao/his/casefrontsheet/CaseFrontSheetDao.java

@@ -500,7 +500,7 @@ public interface CaseFrontSheetDao extends BaseMapper<CaseFrontsheetMain> {
             "#{assistantTwo},#{cut},#{heal},#{anaesthesia},#{anaesthesiaor},#{date},#{opEndDate},#{anstStartDate},#{anstEndDate})")
     void writeNewZySurgeryRecord(CaseFrontsheetSurgery surgery);
 
-    @Update("update t_case_frontsheet_main set file_status=1, sign_datetime=getdate() where bah=#{bah} and admiss_times=#{times}")
+    @Update("update t_case_frontsheet_main set file_status=1, sign_date=getdate() where bah=#{bah} and admiss_times=#{times}")
     void updateSignStatus(@Param("bah") String bah, @Param("times") int times);
 
     @Delete("delete from t_case_frontsheet_main where bah=#{bah} and admiss_times=#{times}; " +

+ 1 - 4
src/main/java/thyyxxk/webserver/service/casefrontsheet/CaseFrontSheetMainService.java

@@ -160,10 +160,7 @@ public class CaseFrontSheetMainService {
             if (param.getFileStatus() == 0) {
                 list = basDao.selectPatientsForBasByBah(param);
                 if (list.isEmpty()) {
-                    list = basDao.selectSignApply(param.getBah(), param.getFileStatus());
-                    if (list.isEmpty()) {
-                        return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST, "没有找到此患者的未归档病案。");
-                    }
+                    return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST, "没有找到此患者的未归档病案。");
                 }
             } else {
                 list = basDao.selectPatientsFromSignedBase(param);