病案首页。

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>thyyxxk</groupId>
     <artifactId>web-server</artifactId>
-    <version>5.1</version>
+    <version>5.2</version>
     <name>web-server</name>
     <description>server for yibao-web</description>
 

src/main/java/thyyxxk/webserver/dao_his/casefrontsheet/CaseFrontSheetDao.java

@@ -31,7 +31,7 @@ public interface CaseFrontSheetDao {
             "sex " +
             "from zy_inactpatient where " +
             "dis_date>=#{start} and dis_date<=#{end} and " +
-            "ward like #{ward} and " +
+            "ward=#{ward} and " +
             "charindex('$',inpatient_no)=0 " +
             "ORDER BY cast(bed_no AS int)")
     List<SheetOverview> getOutPatients(GetOutSheetParam param);

src/main/java/thyyxxk/webserver/pojo/casefrontsheet/GetOutSheetParam.java

@@ -19,10 +19,6 @@ public class GetOutSheetParam {
         return null == end ? "" : (end).trim();
     }
 
-    public String getWard() {
-        return null == ward ? "" : (ward).trim();
-    }
-
     public String getBah() {
         return null == bah ? "" : (bah).trim();
     }

src/main/java/thyyxxk/webserver/service/casefrontsheet/CaseFrontSheetService.java

@@ -93,8 +93,8 @@ public class CaseFrontSheetService {
     }
 
     public ResultVo<List<PureCodeName>> getUserWards() {
-//        List<PureCodeName> list = createdDao.getUserWards(TokenUtil.getTokenUserId());
-        List<PureCodeName> list = createdDao.getUserWards("01387");
+        List<PureCodeName> list = createdDao.getUserWards(TokenUtil.getTokenUserId());
+//        List<PureCodeName> list = createdDao.getUserWards("01387");
         list.removeIf(Objects::isNull);
         return ResultVoUtil.success(list);
     }
@@ -111,13 +111,15 @@ public class CaseFrontSheetService {
     public ResultVo<List<SheetOverview>> getOutPatient(GetOutSheetParam param) {
         param.setEnd(param.getEnd() + " 23:59:59");
         log.info("获取出院病人>>> {}", param.toString());
-        param.setWard(param.getWard() + "%");
+        if (StringUtil.isBlank(param.getWard())) {
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "请选择科室！");
+        }
         return ResultVoUtil.success(dao.getOutPatients(param));
     }
 
     public ResultVo<GetBasOverviewRet> getOutPatientForBas(GetOutSheetParam param) {
         GetBasOverviewRet ret = new GetBasOverviewRet();
-        if (!param.getWard().equals("")) {
+        if (!StringUtil.isBlank(param.getWard())) {
             int cd = dao.getCDBlfxCount(param.getWard());
             int all = dao.getAllDisPatientCount(param.getWard());
             if (cd == 0 || all == 0) {
@@ -143,7 +145,7 @@ public class CaseFrontSheetService {
             ret.setList(list);
             return ResultVoUtil.success(ret);
         }
-        if (!param.getWard().equals("")) {
+        if (!StringUtil.isBlank(param.getWard())) {
             if (param.getFileStatus() == 0) {
                 list = basDao.selectPatientsForBasByWard(param);
             } else {