修复医保结算单入院日期和所在科室问题。

pom.xml

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

src/main/java/thyyxxk/webserver/dao/his/medicalinsurance/SiQueryDao.java

@@ -7,6 +7,7 @@ import thyyxxk.webserver.entity.medicalinsurance.setllist.BrfChrgitm;
 import thyyxxk.webserver.entity.medicalinsurance.setllist.InptntSetlmtLst;
 import thyyxxk.webserver.entity.medicalinsurance.setllist.OtptntSetlmtLst;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -153,7 +154,7 @@ public interface SiQueryDao {
     @Select("select a.mdtrt_id,a.psn_name,a.gend,a.age,a.psn_no,b.emp_name," +
             "a.psn_type,a.cvlserv_flag,a.pat_no,a.setl_id,b.insuplc_admdvs, " +
             "tel=(select rtrim(home_tel) from a_patient_mi where a_patient_mi.inpatient_no=a.pat_no), " +
-            "admDeptName=(select rtrim(name) from zd_unit_code where code=c.small_dept), " +
+            "admDeptName=(select rtrim(name) from zd_unit_code where code=isnull(c.zk_ward,c.small_dept)), " +
             "c.bed_no as admBed,c.admiss_date as begntime,c.dis_date as endtime, " +
             "inHospdays=datediff(day ,c.admiss_date,c.dis_date), " +
             "a.certno,a.mdtrt_cert_type, b.psn_idet_type, " +
@@ -169,6 +170,11 @@ public interface SiQueryDao {
             "and a.times=c.admiss_times")
     InptntSetlmtLst selectZySetlifo(@Param("setlId") String setlId);
 
+    @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, " +
             "a.hifp_pay,a.acct_pay,a.cvlserv_pay,a.psn_cash_pay,b.insuplc_admdvs, " +

src/main/java/thyyxxk/webserver/service/medicalinsurance/SiQueryService.java

@@ -803,6 +803,10 @@ public class SiQueryService {
         }
         if (index.getType() == SetlType.INPATIENT.getCode()) {
             InptntSetlmtLst lst = dao.selectZySetlifo(index.getSetlId());
+            if (siPatInfo.getLedgerSn() > 1) {
+                Date accountdate = dao.selectAccountDate(siPatInfo.getPatNo(), siPatInfo.getTimes(), siPatInfo.getLedgerSn() - 1);
+                lst.setBegntime(accountdate);
+            }
             if (null == lst) {
                 return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "没有找到此患者的结算信息！");
             }

src/main/resources/application.yml

@@ -71,6 +71,6 @@ si-tj-url: http://jkglcsx.server.zhongmeihealth.com/openInter
 si-access-key: 04eMGRg7beAO6vqwrZiLacV8Uy3jNn7QGDUcBO
 si-secret-key: SK3Oip3a2R3NLz2xm58Mpmi69oFu96KrdKNRKglN
 
-logging:
-  level:
-    thyyxxk.webserver.dao: debug
+#logging:
+#  level:
+#    thyyxxk.webserver.dao: debug