lighter 3 years ago
parent
commit
0f6a4eeb5f

+ 1 - 1
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>

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

@@ -538,7 +538,7 @@ public interface CaseFrontSheetDao extends BaseMapper<CaseFrontsheetMain> {
     @Update("update zy_actpatient set operation=#{operation} where inpatient_no=#{patNo}")
     void updateOperation(@Param("patNo") String patNo, @Param("operation") String operation);
 
-    @Delete("delete from zy_dis_diag_yb with(nolock) where inpatient_no=#{bah} and admiss_times=#{times}")
+    @Delete("delete from zy_dis_diag_yb where inpatient_no=#{bah} and admiss_times=#{times}")
     void deleteOldYbDiag(@Param("bah") String bah, @Param("times") int times);
 
     @Insert("insert into zy_dis_diag_yb (inpatient_no, admiss_times, dis_diag_no, dis_diag_type, dis_diag, " +

+ 1 - 1
src/main/java/thyyxxk/webserver/dao/his/medicalinsurance/UpIdCollectionDao.java

@@ -43,7 +43,7 @@ public interface UpIdCollectionDao {
             "       a.psn_cert_type as patnCertType,  " + // -- 患者证件类别
             "       b.insuplc_admdvs as insuplc,  " + //  -- 参保地
             "       psnSelfpay=cast(a.psn_cash_pay as decimal(16,2)) ,  " + // -- 个人自付
-            "       psnOwnpay=cast(a.fulamt_ownpay_amt as decimal(16,2)) ,  " + // -- 个人自费c
+            "       psnOwnpay=cast(a.fulamt_ownpay_amt as decimal(16,2)) ,  " + // -- 个人自费
             "       acct_pay=cast(a.acct_pay as decimal(16,2)), " + // -- 个人账户支出
             "       psnCashpay=cast(a.psn_cash_pay as decimal(16,2)) ,  " + // --  个人现金支付
             "       a.clr_optins as hsorg,  " + // -- 医保机构

+ 1 - 1
src/main/java/thyyxxk/webserver/dao/his/scheduled/DailyPatientCountDao.java

@@ -19,7 +19,7 @@ public interface DailyPatientCountDao {
             "and isnull(group_no,'00' )='00' and order_code='05888'), " +
             "dangerCount=(select count(1) from yz_act_order with(nolock) where status_flag!='5' " +
             "and isnull(group_no,'00' )='00' and order_code='05887'), " +
-            "operationCount=(select count(1) from op_record with(nolock) where datediff(day,op_datetime,getdate())=1), " +
+            "operationCount=(select count(1) from op_record with(nolock) where status!='d' and datediff(day,op_datetime,getdate())=1), " +
             "clinicCount=(select count(1) from mzy_reqrec with(nolock) where datediff(day,visit_date,getdate())=1), " +
             "rescueCount=((select count(1) from yz_act_order with(nolock) where status_flag > '2' and " +
             "datediff(day,start_time,getdate())=1 and isnull(group_no,'00' )='00' and order_code in " +