Procházet zdrojové kódy

门诊结算单添加部分信息

lighter před 3 roky
rodič
revize
f4286879d9

+ 1 - 1
pom.xml

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

+ 2 - 7
src/main/java/thyyxxk/webserver/dao/his/medicalinsurance/SiQueryDao.java

@@ -175,13 +175,8 @@ public interface SiQueryDao {
             "and a.times=c.admiss_times")
     InptntSetlmtLst selectZySetlinfo(@Param("setlId") String setlId, @Param("table") String table);
 
-    @Select("select account_date from zy_ledger_file where inpatient_no=#{patNo} and admiss_times=#{times} and ledger_sn=#{sn}")
-    Date selectAccountDate(@Param("patNo") String patNo,
-                           @Param("times") int times,
-                           @Param("sn") int sn);
-
-    @Select("select a.mdtrt_id,a.psn_name,a.gend,a.age,a.cvlserv_flag,a.psn_type, " +
-            "b.emp_name,a.certno,a.med_type,b.dise_code,a.medfee_sumamt,a.psn_no, " +
+    @Select("select a.mdtrt_id,a.psn_name,a.gend,a.age,a.cvlserv_flag,a.psn_type,a.pat_no,a.setl_time, " +
+            "b.dise_name,b.emp_name,a.certno,a.med_type,b.dise_code,a.medfee_sumamt,a.psn_no, " +
             "a.hifp_pay,a.acct_pay,a.cvlserv_pay,a.psn_cash_pay,b.insuplc_admdvs, " +
             "a.hifmi_pay,a.maf_pay,a.hifob_pay,a.oth_pay,a.staff_id,a.hifes_pay, " +
             "staffName=(select rtrim(name) from a_employee_mi where code=staff_id) " +

+ 7 - 0
src/main/java/thyyxxk/webserver/entity/medicalinsurance/setllist/OtptntSetlmtLst.java

@@ -3,6 +3,7 @@ package thyyxxk.webserver.entity.medicalinsurance.setllist;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * @description: 门诊结算清单
@@ -253,4 +254,10 @@ public class OtptntSetlmtLst {
      * */
     private String staffName;
 
+    /**
+     * 门诊ID
+     * */
+    private String patNo;
+
+    private Date setlTime;
 }

+ 0 - 1
src/main/java/thyyxxk/webserver/service/medicalinsurance/SiQueryService.java

@@ -48,7 +48,6 @@ public class SiQueryService {
     private final SiSetlinfoDao setlinfoDao;
     private final RedisLikeService redis;
 
-
     @Autowired
     public SiQueryService(ExecService exec, SiQueryDao dao, SendWxInfoService wxsrvc, SiSetlinfoDao setlinfoDao, RedisLikeService redis) {
         this.exec = exec;