修复病案首页由于更换字典表引起的问题

pom.xml

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

src/main/java/thyyxxk/webserver/dao/his/casefrontsheet/SheetSearchDao.java

@@ -23,7 +23,7 @@ public interface SheetSearchDao {
     List<PureCodeName> searchClinicdiag(@Param("method") String method, @Param("content") String content, @Param("page") int page);
 
     @Select("select top 10 rtrim(code) code, rtrim(name) name from " +
-            "(SELECT ROW_NUMBER() OVER(ORDER BY CODE) AS 'Number',  * " +
+            "(SELECT ROW_NUMBER() OVER(order by code) AS 'Number',  * " +
             "from zd_icd_m_code with(nolock) where ${method} like #{content}) a " +
             "where a.[Number]>10*(#{page})")
     List<PureCodeName> searchPathologicDiag(@Param("method") String method, @Param("content") String content, @Param("page") int page);

src/main/java/thyyxxk/webserver/dao/his/yibao/DismissDao.java

@@ -125,7 +125,7 @@ public interface DismissDao {
             "and admiss_times=#{times} and ledger_sn=#{ledgerSn} and isnull(charge_status, '1') <> '1') - " +
             "(select isnull(total_charge,0) from zy_ledger_file " +
             "where inpatient_no=#{patNo} and admiss_times=#{times} and ledger_sn=#{ledgerSn})")
-    BigDecimal getFeeOffset(@Param("patNo") String patNo,
+    BigDecimal  getFeeOffset(@Param("patNo") String patNo,
                      @Param("times") Integer times,
                      @Param("ledgerSn") int ledgerSn);
 

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

@@ -386,7 +386,8 @@ public class CaseFrontSheetService {
 
     private ResultVo<List<PureCodeName>> archiveSheet(CaseFrontsheetMain sheet) {
         String staff = TokenUtil.getTokenUserId();
-        if (userDao.getUserRoles(staff).contains(7)) {
+        List<Integer> roles = userDao.getUserRoles(staff);
+        if (roles.contains(7) || roles.contains(1)) {
             String bah = sheet.getBah();
             int times = sheet.getAdmissTimes();
             if (isLateSubmit(sheet.getDismissDate()) > 8) {

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

@@ -59,9 +59,9 @@ public class SheetSearchService {
         if (method.equals("alpha")) {
             method = "py_code";
         } else if (method.equals("code")) {
-            method = "surgical_operation_code";
+            method = "code";
         } else {
-            method = "operation_operation_name";
+            method = "name";
         }
         return dao.searchSurgery(method, content, page);
     }

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

@@ -7,6 +7,7 @@ import thyyxxk.webserver.entity.casefrontsheet.CaseFrontsheetMain;
 import thyyxxk.webserver.entity.casefrontsheet.CaseFrontsheetSurgery;
 import thyyxxk.webserver.entity.dictionary.PureCodeName;
 import thyyxxk.webserver.utils.DateUtil;
+import thyyxxk.webserver.utils.IdCardUtil;
 import thyyxxk.webserver.utils.StringUtil;
 
 import java.util.*;
@@ -81,6 +82,9 @@ public class VerifyCaseFrontSheet {
         if (StringUtil.invalidValue(info.getSocialNo())) {
             array.add(new PureCodeName("socialNo","患者身份证不能为空！"));
         }
+        if (!IdCardUtil.isValidatedIdCard(info.getSocialNo())) {
+            array.add(new PureCodeName("socialNo","患者身份证不合法！"));
+        }
         if (StringUtil.invalidValue(info.getOccupation())) {
             array.add(new PureCodeName("occupation","患者职业不能为空！"));
         }