瀏覽代碼

网络问题兼容

lighter 3 年之前
父節點
當前提交
480314ad2f

+ 22 - 21
src/main/java/thyyxxk/webserver/dao/his/medicalinsurance/SiManageDao.java

@@ -180,30 +180,31 @@ public interface SiManageDao {
     List<FsiDiagnoseDtos> selectFsiDiagnoseDtos(@Param("patNo") String patNo, @Param("times") int times);
 
     @Select("select\n" +
-            "    rxId=cast(cast(act_order_no as decimal) as varchar)+'_'+charge_code_mx,\n" +
-            "    rxno=cast(cast(act_order_no as decimal) as varchar),\n" +
-            "    longDrordFlag=case when frequ_code='ONCE' then 0 else 1 end,\n" +
-            "    listType=(select list_type from t_si_setl_fee_detl where setl_id=#{setlId} and feedetl_sn=a.detail_sn),\n" +
-            "    chrgType=(select med_chrgitm_type from t_si_setl_fee_detl where setl_id=#{setlId} and feedetl_sn=a.detail_sn),\n" +
-            "    drordBhvr=case when frequ_code='ONCE' then 1 else 2 end,\n" +
-            "    hilist_code=(select hilist_code from t_si_setl_fee_detl where setl_id=#{setlId} and feedetl_sn=a.detail_sn),\n" +
-            "    hilist_name=(select hilist_name from t_si_setl_fee_detl where setl_id=#{setlId} and feedetl_sn=a.detail_sn),\n" +
-            "    hilist_lv=(select chrgitm_lv from t_si_setl_fee_detl where setl_id=#{setlId} and feedetl_sn=a.detail_sn),\n" +
-            "    pric=(select pric from t_si_setl_fee_detl where setl_id=#{setlId} and feedetl_sn=a.detail_sn),\n" +
+            "    rxId=cast(cast(order_no as decimal) as varchar)+'_'+charge_code_mx,\n" +
+            "    rxno=cast(cast(order_no as decimal) as varchar),\n" +
+            "    longDrordFlag=case when (select frequ_code from yz_inact_order where act_order_no=order_no)='ONCE' then 0 else 1 end,\n" +
+            "    b.list_type,\n" +
+            "    chrgType=b.med_chrgitm_type,\n" +
+            "    drordBhvr=case when (select frequ_code from yz_inact_order where act_order_no=order_no)='ONCE' then 1 else 2 end,\n" +
+            "    b.hilist_code,\n" +
+            "    b.hilist_name,\n" +
+            "    hilist_lv=b.chrgitm_lv,\n" +
+            "    b.pric,\n" +
             "    a.charge_code_mx as hosplist_code,a.charge_amount as cnt,\n" +
-            "    hosplistName=(select medins_list_name from t_si_setl_fee_detl where setl_id=#{setlId} and feedetl_sn=a.detail_sn),\n" +
+            "    hosplistName=b.medins_list_name,\n" +
             "    a.charge_fee as sumamt,\n" +
-            "    ownpayAmt=(select fulamt_ownpay_amt from t_si_setl_fee_detl where setl_id=#{setlId} and feedetl_sn=a.detail_sn),\n" +
-            "    selfpayAmt=(select preselfpay_amt from t_si_setl_fee_detl where setl_id=#{setlId} and feedetl_sn=a.detail_sn),\n" +
-            "    b.start_time as drord_begn_date,b.end_time as drord_stop_date,\n" +
-            "    drord_dept_codg=(select bilg_dept_codg from t_si_setl_fee_detl where setl_id=#{setlId} and feedetl_sn=a.detail_sn),\n" +
-            "    drord_dept_name=(select bilg_dept_name from t_si_setl_fee_detl where setl_id=#{setlId} and feedetl_sn=a.detail_sn),\n" +
-            "    drord_dr_codg=(select bilg_dr_codg from t_si_setl_fee_detl where setl_id=#{setlId} and feedetl_sn=a.detail_sn),\n" +
-            "    drord_dr_name=(select bilg_dr_name from t_si_setl_fee_detl where setl_id=#{setlId} and feedetl_sn=a.detail_sn),\n" +
-            "    drord_dr_profttl=(select rtrim(emp_tit_code) from a_employee_mi where code=b.enter_oper),\n" +
+            "    ownpayAmt=b.fulamt_ownpay_amt,\n" +
+            "    selfpayAmt=b.preselfpay_amt,\n" +
+            "    drord_begn_date=(select start_time from yz_inact_order where act_order_no=order_no),\n" +
+            "    drord_stop_date=(select end_time from yz_inact_order where act_order_no=order_no),\n" +
+            "    drord_dept_codg=b.bilg_dept_codg,\n" +
+            "    drord_dept_name=b.bilg_dept_name,\n" +
+            "    drord_dr_codg=b.bilg_dr_codg,\n" +
+            "    drord_dr_name=b.bilg_dr_name,\n" +
+            "    drord_dr_profttl=(select rtrim(emp_tit_code) from a_employee_mi where code=b.bilg_dr_codg),\n" +
             "    curr_drord_flag='1'\n" +
-            "from zy_detail_charge a, yz_inact_order b where order_no>100 and a.inpatient_no=#{patNo} and a.admiss_times=#{times}\n" +
-            "and a.ledger_sn>0 and a.inpatient_no=b.inpatient_no and a.admiss_times=b.admiss_times")
+            "from zy_detail_charge a, t_si_setl_fee_detl b where a.order_no>100 and a.inpatient_no=#{patNo} and a.admiss_times=#{times}\n" +
+            "and a.ledger_sn>0 and b.setl_id=#{setlId} and b.feedetl_sn=a.detail_sn")
     List<FsiOrderDtos> selectFsiOrderDtos(@Param("patNo") String patNo, @Param("times") int times, @Param("setlId") String setlId);
 
     @Select("select setl_id from t_si_setlinfo where pat_no=#{patNo} and times=#{times} and revoked=0")

+ 1 - 1
src/main/java/thyyxxk/webserver/service/externalhttp/ThmzSystem.java

@@ -7,7 +7,7 @@ import thyyxxk.webserver.entity.mzpayqrcode.PatInfo;
 
 import java.util.Map;
 
-@BaseRequest(baseURL = "http://webhis.thyy.cn:81/thmz/api/v1")
+@BaseRequest(baseURL = "http://172.16.32.160:81/thmz/api/v1")
 //@BaseRequest(baseURL = "http://172.16.32.161:81/thmz/api/v1")
 public interface ThmzSystem {
 

+ 2 - 1
src/main/java/thyyxxk/webserver/service/medicalinsurance/ExecService.java

@@ -37,7 +37,8 @@ public class ExecService {
     private static final String OUTPUT = "output";
     private static final String MAC_ADDR = "FE-FC-FE-35-35-DE";
     private static final String IP_ADDR = "218.104.151.243";
-    private static final String siApiUrl = "http://mbs.hun.hsip.gov.cn:20001/isp-api/powercsb/1101";
+    //    private static final String siApiUrl = "http://mbs.hun.hsip.gov.cn:20001/isp-api/powercsb/1101";
+    private static final String siApiUrl = "http://10.93.28.228/isp-api/powercsb/1101";
     private final SiZyDao dao;
     private volatile String signNo;
 

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

@@ -384,7 +384,7 @@ public class SiManageService {
         FsiHisDataDto fsiHisDataDto = new FsiHisDataDto();
 
         mainPart.setPatientDtos(patientDtos);
-        mainPart.setFsiHisDataDto(fsiHisDataDto);
+//        mainPart.setFsiHisDataDto(fsiHisDataDto);
 
         String ref = JSONObject.toJSONStringWithDateFormat(mainPart, "yyyy-MM-dd HH:mm:ss");
         input.getJSONObject("input").put("data", JSONObject.parseObject(ref));

+ 1 - 1
src/main/java/thyyxxk/webserver/utils/VoiceUtil.java

@@ -33,7 +33,7 @@ public class VoiceUtil {
 
     public static ResultVo<String> textToSpeech(String data, String id) {
         deleteOldFile(id);
-        String voiceUrl = "http://webhis.thyy.cn:8888/voices/" + id + ".mp3";
+        String voiceUrl = "http://172.16.32.160:8888/voices/" + id + ".mp3";
         String filePath = "D:\\apache-tomcat-9.0.30\\webapps\\voices\\" + id + ".mp3";
         final Boolean[] progress = { false, null };
         final String[] message = {""};

+ 1 - 1
src/main/resources/application-prod.yml

@@ -53,7 +53,7 @@ logging:
   level:
     thyyxxk.webserver.dao: info
 
-triage-notify-url: http://webhis.thyy.cn:8082/triage/roomScreen/pushMsg
+triage-notify-url: http://172.16.32.160:8082/triage/roomScreen/pushMsg
 si-tj-url: http://jkglcsx.server.zhongmeihealth.com/openInter
 
 si-access-key: 04eMGRg7beAO6vqwrZiLacV8Uy3jNn7QGDUcBO

+ 3 - 3
src/main/resources/application.yml

@@ -73,7 +73,7 @@ si-secret-key: SK3Oip3a2R3NLz2xm58Mpmi69oFu96KrdKNRKglN
 
 execute-scheduled: false
 
-logging:
-  level:
-    thyyxxk.webserver.dao: debug
+#logging:
+#  level:
+#    thyyxxk.webserver.dao: debug