完善门诊补录

src/main/java/thyyxxk/webserver/controller/medicalinsurance/SiMzController.java

@@ -46,8 +46,10 @@ public class SiMzController {
     }
 
     @GetMapping("/getHistoryMzReceipts")
-    public ResultVo<List<MzDepositFile>> getHistoryMzReceipts(@RequestParam("patNo") String patNo) {
-        return service.getHistoryMzReceipts(patNo);
+    public ResultVo<List<MzDepositFile>> getHistoryMzReceipts(@RequestParam("patNo") String patNo,
+                                                              @RequestParam("start") String start,
+                                                              @RequestParam("end") String end) {
+        return service.getHistoryMzReceipts(patNo, start, end);
     }
 
     @PostMapping("/getHistoryReceiptDetail")

src/main/java/thyyxxk/webserver/controller/medicalinsurance/SiQueryController.java

@@ -93,6 +93,11 @@ public class SiQueryController {
         return service.querySpecialChronicDiseasesAccreditation(q);
     }
 
+    @GetMapping("/queryMzMatnDises")
+    public ResultVo<List<SiMzMatnDise>> queryMzMatnDises() {
+        return service.queryMzMatnDises();
+    }
+
     @PostMapping("/queryPersonnelAssignmentInfo")
     public ResultVo<List<PsnFixMedin>> queryPersonnelAssignmentInfo(@RequestBody BscQryPrm q) {
         return service.queryPersonnelAssignmentInfo(q);

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

@@ -3,9 +3,7 @@ package thyyxxk.webserver.dao.his.medicalinsurance;
 import org.apache.ibatis.annotations.*;
 import thyyxxk.webserver.entity.markmtfees.*;
 import thyyxxk.webserver.entity.medicalinsurance.outpatient.MzPatientInfo;
-import thyyxxk.webserver.entity.medicalinsurance.query.SiPatInfo;
 import thyyxxk.webserver.entity.medicalinsurance.outpatient.*;
-import thyyxxk.webserver.entity.medicalinsurance.setlinfo.SiSetlinfo;
 
 import java.util.List;
 
@@ -16,20 +14,6 @@ import java.util.List;
  **/
 @Mapper
 public interface SiMzDao {
-    @Select("select a.psn_no, " +
-            "b.visit_date as begntime, " +
-            "a.certno as mdtrtCertNo, " +
-            "a.psn_cert_type, " +
-            "a.certno, " +
-            "a.psn_name, " +
-            "rtrim(b.doctor_code) as atddrNo, " +
-            "drName=(select rtrim(name) from a_employee_mi where code=b.doctor_code), " +
-            "rtrim(b.visit_dept_code) as deptCode, " +
-            "deptName=(select rtrim(name) from zd_unit_code where code=b.visit_dept_code), " +
-            "caty=(select si_caty from zd_unit_code where code=b.visit_dept_code) " +
-            "from t_si_pat_info a, mz_visit_table b where a.pat_no=#{patNo} and a.times=#{times} " +
-            "and a.pat_no=b.patient_id and a.times=b.times")
-    Regstrtn selectRegstrtn(@Param("patNo") String patNo, @Param("times") int times);
 
     @Select("select times from mz_patient_mi where patient_id=#{patientId} ")
     Integer selectMaxTimes(@Param("patientId") String patientId);
@@ -40,11 +24,6 @@ public interface SiMzDao {
                                @Param("times") int times,
                                @Param("ledgerSn") int ledgerSn);
 
-    @Update("update t_si_pat_info set insuplc_admdvs=#{insuplcAdmdvs},psn_type=#{psnType},emp_name=#{empName}," +
-            "mdtrt_id=#{mdtrtId},insutype=#{insutype},visit_datetime=#{visitDate} " +
-            "where pat_no=#{patNo} and times=#{times} ")
-    void afterRegistrtn(MzPatientInfo p);
-
     @Select("SELECT patient_id,times,visit_dept_code, " +
             "visitDeptName=(select rtrim(name) from zd_unit_code where code=visit_dept_code), " +
             "doctor_code,visit_date,icd_code,receipt_no,order_no,op_id,op_day,windows_no," +
@@ -62,13 +41,6 @@ public interface SiMzDao {
                        @Param("receiptNo") Integer receiptNo,
                        @Param("orderNo") Integer orderNo);
 
-
-
-    @Select("select count(1) from t_mt_receipt where patient_id=#{patientId} and times=#{times} and receipt_no=#{receiptNo}")
-    int selectMtFeeCount(@Param("patientId") String patientId,
-                       @Param("times") String times,
-                       @Param("receiptNo") String receiptNo);
-
     @Select("select rtrim(name) from a_employee_mi where code=#{code}")
     String selectDoctorName(@Param("code") String code);
 
@@ -84,9 +56,6 @@ public interface SiMzDao {
     @Select("select rtrim(name) from yp_zd_unit where code=#{code}")
     String selectDrugUnit(@Param("code") String code);
 
-    @Select("select count(1) from mt_part_info where patient_id=#{patNo} and times=#{times}")
-    int selectMtPartCount(@Param("patNo") String patNo, @Param("times") int times);
-
     @Insert("insert into mt_part_info (patient_id, times, icd, balance, serial_apply, responce_type, " +
             "hic_no, icd_code, icd_name, second_icd_code, third_icd_code, mz_serial_no, create_datetime) values "+
             "(#{patientId},#{times},null,null,#{bizType},'03',#{hicNo},#{icdCode},#{icdName}," +
@@ -118,87 +87,20 @@ public interface SiMzDao {
     void deleteAllReceipts(@Param("patNo") String patNo,
                            @Param("times") Integer times);
 
-    @Select("select feedetlSn=(patient_id + '_' + cast(times as varchar) + '_' + cast(receipt_no as varchar) + '_' + " +
-            "cast(order_no as varchar) + '_' + cast(item_no as varchar)), " +
-            "receipt_no as rxno, fee_date as feeOcurTime, " +
-            "medListCodg=isnull((select max(national_code) from yp_zd_dict where code=his_item_code), " +
-            "(select max(national_code) from zd_charge_item where code=his_item_code)), " +
-            "his_item_code as medinsListCodg, " +
-            "charge_fee as detItemFeeSumamt, " +
-            "quantity as cnt, price as pric, " +
-            "bilgDeptCodg=(select rtrim(dept_code) from a_employee_mi where code=input_staff) , " +
-            "bilgDeptName=(select rtrim(name) from zd_unit_code where code=(select rtrim(dept_code) from a_employee_mi where code=input_staff)), " +
-            "input_staff as bilgDrCodg, " +
-            "input_man as bilgDrName " +
-            "from t_mt_receipt where patient_id=#{patNo} and times=#{times} and yb_trans_flag=0 ")
-    List<FeeDetail> selectOutpatientFees(@Param("patNo") String patNo, @Param("times") int times);
-
-    @Update("update t_mt_receipt set yb_trans_flag=1,chrgitm_lv=#{chrgLv},med_chrgitm_type=#{chrgType} where " +
-            "patient_id=#{patNo} and times=#{times} and receipt_no=#{recNo} and order_no=#{odrNo} and item_no=#{itmNo}")
-    void afterUploadFees(@Param("patNo") String patNo,
-                         @Param("times") int times,
-                         @Param("recNo") int recNo,
-                         @Param("odrNo") int odrNo,
-                         @Param("itmNo") int itmNo,
-                         @Param("chrgLv") String chrgLv,
-                         @Param("chrgType") String chrgType);
-
-    @Update("update t_mt_receipt set yb_trans_flag=0 where patient_id=#{patNo} and times=#{times}")
-    void afterRevokeFees(@Param("patNo") String patNo, @Param("times") int times);
-
-    @Select("select psn_no,insuplc_admdvs,certno as mdtrtCertNo,certno, psn_cert_type,psn_type,psn_name,med_type,mdtrt_id,insutype, " +
-            "medfeeSumamt=(select sum(charge_fee) from t_mt_receipt where patient_id=#{patNo} and t_mt_receipt.times=#{times}) " +
-            "from t_si_pat_info where pat_no=#{patNo} and times=#{times}")
-    PreSetlmt selectPreSetlmt(@Param("patNo") String patNo, @Param("times") int times);
-
-    @Select("select diagType='1', " +
-            "diagSrtNo=1, " +
-            "rtrim(icd_code) as diagCode, " +
-            "rtrim(icd_text) as diagName, " +
-            "rtrim(visit_dept_code) as diagDept, " +
-            "rtrim(doctor_code) as diseDorNo, " +
-            "diseDorName=(select rtrim(name) from a_employee_mi where code=doctor_code), " +
-            "visit_date as diagTime, " +
-            "valiFlag='1' " +
-            "from mz_visit_table where patient_id=#{patNo} and times=#{times}")
-    Diseinfo selectDiseinfo(@Param("patNo") String patNo, @Param("times") int times);
-
     @Update("update t_si_pat_info set dise_code=#{code},dise_name=#{name} where pat_no=#{patNo} and times=#{times}")
     void updatePatDiseinfo(@Param("patNo") String patNo, @Param("times") int times,
                            @Param("code") String code, @Param("name") String name);
 
-    @Update("update t_si_pat_info set fulamt_ownpay_amt=#{fulamtOwnpayAmt}, overlmt_amt=#{overlmtAmt}, " +
-            "preselfpay_amt=#{preselfpayAmt}, inscp_scp_amt=#{inscpScpAmt} where pat_no=#{patNo} and times=#{times}")
-    void updateSortOfAmt(SiPatInfo patInfo);
-
-    @Select("select * from t_si_setlinfo where pat_no=#{patNo} and times=#{times} and revoked=0")
-    SiSetlinfo selectSettledInfo(@Param("patNo") String patNo, @Param("times") int times);
-
-    @Select("select psn_no,certno as mdtrtCertNo, " +
-            "psn_cert_type,certno,med_type,insuplc_admdvs, " +
-            "medfeeSumamt=(select sum(charge_fee) from t_mt_receipt where patient_id=#{patNo} and t_mt_receipt.times=#{times}), " +
-            "mdtrt_id,insutype,fulamt_ownpay_amt,overlmt_amt as overlmtSelfpay, " +
-            "preselfpay_amt,inscp_scp_amt " +
-            "from t_si_pat_info where pat_no=#{patNo} and times=#{times}")
-    Setlmt selectSetlmt(@Param("patNo") String patNo, @Param("times") int times);
-
-    @Update("update t_si_setlinfo set revoked=1 where pat_no=#{patNo} and times=#{times}")
-    void deleteSetlInfo(@Param("patNo") String patNo, @Param("times") int times);
-
     @Update("delete from t_si_setldetail where pat_no=#{patNo} and times=#{times}")
     void deleteSetlDetail(@Param("patNo") String patNo, @Param("times") int times);
 
-    @Update("update t_si_pat_info set rvk_setl_msgid=#{rvkSetlMsgid} where pat_no=#{patNo} and times=#{times}")
-    void updateRvkSetlMsgid(@Param("patNo") String patNo, @Param("times") int times, @Param("rvkSetlMsgid") String rvkSetlMsgid);
-
     @Select("select *, " +
             "chargeFee=(select sum(amount) from mz_deposit_file a where a.patient_id=patNo and a.times=temp.times and a.receipt_no=receiptNo), " +
             "status=(select count(1) from t_mt_receipt a where a.patient_id=patNo and a.times=temp.times and a.receipt_no=receiptNo) " +
             "from (SELECT rtrim(patient_id) patNo,times,rtrim(receipt_no) receiptNo,charge_date chargeDate FROM mz_deposit_file " +
-            "where patient_id=#{patNo} " +
-            "and charge_date>='2021-11-12 00:00:00' " +
+            "where patient_id=#{patNo} and charge_date>=#{start} and charge_date<=#{end} " +
             " group by patient_id, times, receipt_no,charge_date) temp")
-    List<MzDepositFile> selectMzDepositFiles(@Param("patNo") String patNo);
+    List<MzDepositFile> selectMzDepositFiles(@Param("patNo") String patNo, @Param("start") String start, @Param("end") String end);
 
     @Select("select patient_id,times,receipt_no,order_no,item_no,charge_item_code, " +
             "charge_bill_code,quantity,unit_price,serial,serial_no, " +
@@ -207,7 +109,10 @@ public interface SiMzDao {
             "group_no,confirm_flag,instruction_text,drug_win,price_time,tc_no, " +
             "bill_item_code,doctor_code,tc_name,drugName=(case when group_no='00' then " +
             "(select name from zd_charge_item a where a.code=charge_item_code) else " +
-            "(select top 1 name from yp_zd_dict a where a.code=charge_item_code) end) " +
+            "(select top 1 name from yp_zd_dict a where a.code=charge_item_code) end)," +
+            "nationalCode=(case when group_no='00' then " +
+            "(select national_code from zd_charge_item a where a.code=charge_item_code) else " +
+            "(select max(national_code) from yp_zd_dict a where a.code=charge_item_code) end) " +
             "from mz_charge_detail where patient_id=#{patNo} and times=#{times} and " +
             "receipt_no=#{receipt} and bill_item_code!='TC' and charge_item_code!='BILL99'")
     List<MzReceipt> selectMzCharge(@Param("patNo") String patNo, @Param("times") int times, @Param("receipt") int receipt);

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

@@ -226,5 +226,7 @@ public interface SiQueryDao {
             "</foreach>" +
             "</script>")
     void insertSetlFeeDetlBatch(List<SiSetlFeeDetl> list);
-    
+
+    @Select("select * from t_si_mz_matn_dise")
+    List<SiMzMatnDise> selectAllMzMatnDises();
 }

src/main/java/thyyxxk/webserver/entity/markmtfees/MzReceipt.java

@@ -51,6 +51,7 @@ public class MzReceipt {
     private BigDecimal price;
     private BigDecimal chargeFee;
     private Boolean checked;
+    private String nationalCode;
 
     public String getDrugName() {
         return null == drugName ? "" : (drugName).trim();

src/main/java/thyyxxk/webserver/entity/medicalinsurance/query/SiMzMatnDise.java

@@ -0,0 +1,46 @@
+package thyyxxk.webserver.entity.medicalinsurance.query;
+
+import java.io.Serializable;
+import lombok.Data;
+
+@Data
+public class SiMzMatnDise implements Serializable {
+
+	private static final long serialVersionUID =  8223096688862010246L;
+
+	/**
+	 * 诊断编码
+	 */
+	private String code;
+
+	/**
+	 * 诊断名称
+	 */
+	private String name;
+
+	/**
+	 * 险种类型
+	 */
+	private String insutype;
+
+	/**
+	 * 疾病限额方式
+	 */
+	private String limitWay;
+
+	/**
+	 * 限额额度计算方式
+	 */
+	private String limitCalWay;
+
+	/**
+	 * 疾病限额
+	 */
+	private String limitAmt;
+
+	/**
+	 * 报销比例
+	 */
+	private Double reimbursementProp;
+
+}

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

@@ -49,65 +49,12 @@ public class SiMzService {
         p.setStaffId(TokenUtil.getTokenUserId());
         RestTemplate restTemplate = new RestTemplate();
         return restTemplate.postForObject(siFeeUrl + ":1100/mzFee/outpatientRegistration", p, ResultVo.class);
-//        JSONObject input = exec.makeTradeHeaderWithInsureArea(SiFunction.OUTPATIENT_REGISTRATION, p.getInsuplcAdmdvs());
-//        Regstrtn regstrtn = dao.selectRegstrtn(p.getPatNo(), p.getTimes());
-//        if (null == regstrtn) {
-//            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "mz_visit_table患者信息为空，请联系医生重开处方。");
-//        }
-//        regstrtn.setInsutype(p.getInsutype());
-//        regstrtn.setMdtrtCertType(MdtrtCertType.RESIDENT_IDENTITY_CARD.getCode());
-//        regstrtn.setPsnType(p.getPsnType());
-//        regstrtn.setIptOtpNo(p.getPatNo());
-//        String ref = JSONObject.toJSONStringWithDateFormat(regstrtn, "yyyy-MM-dd HH:mm:ss");
-//        input.getJSONObject("input").put("data", JSONObject.parseObject(ref));
-//        JSONObject result = exec.executeTrade(input, SiFunction.OUTPATIENT_REGISTRATION);
-//        log.info("【操作员：{}】，门诊挂号：\n参数：{}，\n结果：{}", TokenUtil.getTokenUserId(), input, result);
-//        if (null == result) {
-//            return ResultVoUtil.fail(ExceptionEnum.NETWORK_ERROR);
-//        }
-//        if (null == result.getInteger(RESULT_CODE)) {
-//            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "医保中心报错：" + result.getString("message"));
-//        }
-//        if (result.getIntValue(RESULT_CODE) == 0) {
-//            JSONObject output = result.getJSONObject(OUTPUT).getJSONObject("data");
-//            p.setMdtrtId(output.getString("mdtrt_id"));
-//            p.setVisitDate(regstrtn.getBegntime());
-//            dao.afterRegistrtn(p);
-//            return ResultVoUtil.success("挂号成功。");
-//        }
-//        return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, result.getString(ERROR_MESSAGE));
     }
 
     public ResultVo<String> revokeOutpatientRegistration(MzPatientInfo p) {
         p.setStaffId(TokenUtil.getTokenUserId());
         RestTemplate restTemplate = new RestTemplate();
         return restTemplate.postForObject(siFeeUrl + ":1100/mzFee/revokeOutpatientRegistration", p, ResultVo.class);
-//        if (null == p.getTimes()) {
-//            p.setTimes(dao.selectMaxTimes(p.getPatNo()));
-//        }
-//        SiPatInfo siPatInfo = queryDao.selectSiPatInfoForMz(p.getPatNo(), p.getTimes());
-//        if (null == siPatInfo || StringUtil.isBlank(siPatInfo.getMdtrtId())) {
-//            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "此患者没有有效的医保挂号信息。");
-//        }
-//        JSONObject input = exec.makeTradeHeaderWithInsureArea(SiFunction.REVOKE_OUTPATIENT_REGISTRATION, siPatInfo.getInsuplcAdmdvs());
-//        JSONObject data = new JSONObject();
-//        data.put("psn_no", siPatInfo.getPsnNo());
-//        data.put("mdtrt_id", siPatInfo.getMdtrtId());
-//        data.put("ipt_otp_no", p.getPatNo());
-//        input.getJSONObject("input").put("data", data);
-//        JSONObject result = exec.executeTrade(input, SiFunction.REVOKE_OUTPATIENT_REGISTRATION);
-//        log.info("【操作员：{}】，取消门诊挂号：\n参数：{}，\n结果：{}", TokenUtil.getTokenUserId(), input, result);
-//        if (null == result) {
-//            return ResultVoUtil.fail(ExceptionEnum.NETWORK_ERROR);
-//        }
-//        if (null == result.getInteger(RESULT_CODE)) {
-//            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "医保中心报错：" + result.getString("message"));
-//        }
-//        if (result.getIntValue(RESULT_CODE) == 0) {
-//            queryDao.clearMdtrtIdForMz(p.getPatNo(), p.getTimes(), null);
-//            return ResultVoUtil.success("取消门诊挂号成功。");
-//        }
-//        return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, result.getString(ERROR_MESSAGE));
     }
 
     public ResultVo<List<Map<String, Object>>> getMzReceipts(MzPatientInfo p) {
@@ -186,8 +133,8 @@ public class SiMzService {
         return ResultVoUtil.success(finalResult);
     }
 
-    public ResultVo<List<MzDepositFile>> getHistoryMzReceipts(String patNo) {
-        List<MzDepositFile> mzChargeList = dao.selectMzDepositFiles(patNo);
+    public ResultVo<List<MzDepositFile>> getHistoryMzReceipts(String patNo, String start, String end) {
+        List<MzDepositFile> mzChargeList = dao.selectMzDepositFiles(patNo, start, end);
         if (null == mzChargeList || mzChargeList.isEmpty()) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "没有找到历史处方！");
         }
@@ -272,6 +219,10 @@ public class SiMzService {
     }
 
     public ResultVo<String> insertSiMzFees(List<MzReceipt> receipts) {
+        receipts.removeIf(itm -> !itm.getChecked());
+        if (receipts.size() == 0) {
+            return ResultVoUtil.fail(ExceptionEnum.NULL_POINTER, "请选择至少一条处方明细！");
+        }
         MzReceipt receipt = receipts.get(0);
         SiPatInfo siPatInfo = queryDao.selectSiPatInfoForMz(receipt.getPatientId(), receipt.getTimes());
         if (null == siPatInfo || StringUtil.isBlank(siPatInfo.getMdtrtId())) {
@@ -307,142 +258,16 @@ public class SiMzService {
         return ResultVoUtil.success("删除成功。");
     }
 
-//    private ResultVo<String> uploadOutpatientInfo(SpcChrDiseAcct p, SiPatInfo siPatInfo) {
-//        JSONObject input = exec.makeTradeHeaderWithInsureArea(SiFunction.UPLOAD_OUTPATIENT_INFO, siPatInfo.getInsuplcAdmdvs());
-//        JSONObject mdtrtinfo = new JSONObject();
-//        Diseinfo diag = dao.selectDiseinfo(p.getPatNo(), p.getTimes());
-//        if (StringUtil.notBlank(p.getOpspDiseCode())) {
-//            diag.setDiagCode(p.getOpspDiseCode());
-//            diag.setDiagName(p.getOpspDiseName());
-//        }
-//        if (StringUtil.isBlank(diag.getDiagCode())) {
-//            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "患者的门诊诊断为空，请联系医生填写！");
-//        }
-//        dao.updatePatDiseinfo(siPatInfo.getPatNo(), siPatInfo.getTimes(), diag.getDiagCode(), diag.getDiagName());
-//        mdtrtinfo.put("mdtrt_id", siPatInfo.getMdtrtId());
-//        mdtrtinfo.put("psn_no", siPatInfo.getPsnNo());
-//        mdtrtinfo.put("med_type", siPatInfo.getMedType());
-//        mdtrtinfo.put("begntime", DateUtil.formatDatetime(siPatInfo.getVisitDatetime()));
-//        mdtrtinfo.put("main_cond_dscr", p.getOpspDiseName());
-//        mdtrtinfo.put("dise_codg", p.getOpspDiseCode());
-//        mdtrtinfo.put("dise_name", p.getOpspDiseName());
-//        mdtrtinfo.put("birctrl_type", "");
-//        mdtrtinfo.put("birctrl_matn_date", "");
-//        List<Diseinfo> diseinfo = new ArrayList<>();
-//        diseinfo.add(diag);
-//        String ref = JSONObject.toJSONString(diseinfo);
-//        input.getJSONObject("input").put("mdtrtinfo", mdtrtinfo);
-//        input.getJSONObject("input").put("diseinfo", JSONArray.parse(ref));
-//        JSONObject result = exec.executeTrade(input, SiFunction.UPLOAD_OUTPATIENT_INFO);
-//        log.info("【操作员：{}】门诊就诊信息上传：\n参数：{}，\n结果：{}", TokenUtil.getTokenUserId(), input, result);
-//        return SiUtil.makeReturnWithoutOutput(result, "门诊就诊信息上传成功。");
-//    }
-
     public ResultVo<SiPatInfo> uploadOutpatientFeeDetails(SpcChrDiseAcct p) {
         p.setStaffId(TokenUtil.getTokenUserId());
         RestTemplate restTemplate = new RestTemplate();
         return restTemplate.postForObject(siFeeUrl + ":1100/mzFee/uploadOutpatientFeeDetails", p, ResultVo.class);
-//        String patNo = p.getPatNo();
-//        if (null == p.getTimes()) {
-//            p.setTimes(dao.selectMaxTimes(patNo));
-//        }
-//        SiPatInfo siPatInfo = queryDao.selectSiPatInfoForMz(patNo, p.getTimes());
-//        if (null == siPatInfo || StringUtil.isBlank(siPatInfo.getMdtrtId())) {
-//            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "【门诊号：" + patNo +
-//                    "】未找到此患者的医保挂号信息，请核实。");
-//        }
-//        ResultVo<String> uplRes = uploadOutpatientInfo(p, siPatInfo);
-//        if (null != uplRes && uplRes.getCode() != ExceptionEnum.SUCCESS.getCode()) {
-//            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, uplRes.getMessage());
-//        }
-//        List<FeeDetail> feeDetails = dao.selectOutpatientFees(patNo, p.getTimes());
-//        if (null == feeDetails || feeDetails.isEmpty()) {
-//            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "此患者没有需要上传的费用。");
-//        }
-//        String batchNo = patNo + "_" + p.getTimes();
-//        feeDetails.forEach(item -> {
-//            item.setMdtrtId(siPatInfo.getMdtrtId());
-//            item.setPsnNo(siPatInfo.getPsnNo());
-//            item.setChrgBchno(batchNo);
-//            item.setRxCircFlag(YesOrNo.NO.getCodeStr());
-//            item.setHospApprFlag(YesOrNo.YES.getCodeStr());
-//        });
-//        JSONObject input = exec.makeTradeHeaderWithInsureArea(SiFunction.UPLOAD_OUTPATIENT_FEE_DETAILS, siPatInfo.getInsuplcAdmdvs());
-//        String ref = JSONArray.toJSONString(feeDetails);
-//        JSONArray feedetail = JSONArray.parseArray(ref);
-//        input.getJSONObject("input").put("feedetail", feedetail);
-//        JSONObject result = exec.executeTrade(input, SiFunction.UPLOAD_OUTPATIENT_FEE_DETAILS);
-//        log.info("【操作员：{}】门诊费用明细信息上传：\n参数：{}，\n结果：{}", TokenUtil.getTokenUserId(), input, result);
-//        if (null == result) {
-//            return ResultVoUtil.fail(ExceptionEnum.NETWORK_ERROR);
-//        }
-//        if (null == result.getInteger(RESULT_CODE)) {
-//            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "医保中心报错：" + result.getString("message"));
-//        }
-//        if (result.getIntValue(RESULT_CODE) == 0) {
-//            JSONArray feeRes = result.getJSONObject(OUTPUT).getJSONArray("result");
-//            double fulamtOwnpayAmt = 0d;
-//            double overlmtAmt = 0d;
-//            double preselfpayAmt = 0d;
-//            double inscpScpAmt = 0d;
-//            for (int i = 0; i < feeRes.size(); i++) {
-//                JSONObject fee = feeRes.getJSONObject(i);
-//                fulamtOwnpayAmt += fee.getDoubleValue("fulamt_ownpay_amt");
-//                overlmtAmt += fee.getDoubleValue("overlmt_amt");
-//                preselfpayAmt += fee.getDoubleValue("preselfpay_amt");
-//                inscpScpAmt += fee.getDoubleValue("inscp_scp_amt");
-//
-//                String detlSn = fee.getString("feedetl_sn");
-//                String chrgLv = fee.getString("chrgitm_lv");
-//                String chrgType = fee.getString("med_chrgitm_type");
-//                String[] sns = detlSn.split("_");
-//                int times = Integer.parseInt(sns[1]);
-//                int recNo = Integer.parseInt(sns[2]);
-//                int odrNo = Integer.parseInt(sns[3]);
-//                int itmNo = Integer.parseInt(sns[4]);
-//                dao.afterUploadFees(patNo, times, recNo, odrNo, itmNo, chrgLv, chrgType);
-//            }
-//            siPatInfo.setFulamtOwnpayAmt(fulamtOwnpayAmt);
-//            siPatInfo.setOverlmtAmt(overlmtAmt);
-//            siPatInfo.setPreselfpayAmt(preselfpayAmt);
-//            siPatInfo.setInscpScpAmt(inscpScpAmt);
-//            dao.updateSortOfAmt(siPatInfo);
-//            return ResultVoUtil.success(siPatInfo);
-//        }
-//        return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, result.getString(ERROR_MESSAGE));
     }
 
     public ResultVo<String> revokeOutpatientFeeDetails(MzPatientInfo p) {
         p.setStaffId(TokenUtil.getTokenUserId());
         RestTemplate restTemplate = new RestTemplate();
         return restTemplate.postForObject(siFeeUrl + ":1100/mzFee/revokeOutpatientFeeDetails", p, ResultVo.class);
-//        if (null == p.getTimes()) {
-//            p.setTimes(dao.selectMaxTimes(p.getPatNo()));
-//        }
-//        SiPatInfo siPatInfo = queryDao.selectSiPatInfoForMz(p.getPatNo(), p.getTimes());
-//        log.info("patNo: {}, times: {}, sipatinfo: {}", p.getPatNo(), p.getTimes(), siPatInfo);
-//        if (null == siPatInfo || StringUtil.isBlank(siPatInfo.getMdtrtId())) {
-//            return ResultVoUtil.fail(ExceptionEnum.NULL_POINTER, "没有此患者的医保挂号信息！");
-//        }
-//        JSONObject input = exec.makeTradeHeaderWithInsureArea(SiFunction.REVOKE_OUTPATIENT_FEE_DETAILS, siPatInfo.getInsuplcAdmdvs());
-//        JSONObject data = new JSONObject();
-//        data.put("mdtrt_id", siPatInfo.getMdtrtId());
-//        data.put("psn_no", siPatInfo.getPsnNo());
-//        data.put("chrg_bchno", "0000");
-//        input.getJSONObject("input").put("data", data);
-//        JSONObject result = exec.executeTrade(input, SiFunction.REVOKE_OUTPATIENT_FEE_DETAILS);
-//        log.info("【操作员：{}】门诊费用明细信息撤销，参数：{}，结果：{}", TokenUtil.getTokenUserId(), input, result);
-//        if (null == result) {
-//            return ResultVoUtil.fail(ExceptionEnum.NETWORK_ERROR);
-//        }
-//        if (null == result.getInteger(RESULT_CODE)) {
-//            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "医保中心报错：" + result.getString("message"));
-//        }
-//        if (result.getIntValue(RESULT_CODE) == 0) {
-//            dao.afterRevokeFees(p.getPatNo(), p.getTimes());
-//            return ResultVoUtil.success("门诊费用明细信息撤销成功。");
-//        }
-//        return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, result.getString(ERROR_MESSAGE));
     }
 
     public ResultVo<FundDetail> outpatientPreSettlement(MzPatientInfo p) {
@@ -451,125 +276,14 @@ public class SiMzService {
         }
         RestTemplate restTemplate = new RestTemplate();
         return restTemplate.postForObject(siFeeUrl + ":1100/mzFee/outpatientPreSettlement", p, ResultVo.class);
-//        if (null == p.getTimes()) {
-//            p.setTimes(dao.selectMaxTimes(p.getPatNo()));
-//        }
-//        ResultVo<FundDetail> fundDetail1 = getFundDetailResultVo(p);
-//        if (fundDetail1 != null) return fundDetail1;
-//        PreSetlmt preSetlmt = dao.selectPreSetlmt(p.getPatNo(), p.getTimes());
-//        preSetlmt.setMedfeeSumamt(preSetlmt.getMedfeeSumamt().setScale(2, RoundingMode.HALF_UP));
-//        JSONObject input = exec.makeTradeHeaderWithInsureArea(SiFunction.OUTPATIENT_PRE_SETTLEMENT, preSetlmt.getInsuplcAdmdvs());
-//        preSetlmt.setMdtrtCertType(MdtrtCertType.RESIDENT_IDENTITY_CARD.getCode());
-//        preSetlmt.setPsnSetlway(PsnSetlWay.SETTLE_BY_ITEMS.getCode());
-//        preSetlmt.setAcctUsedFlag(YesOrNo.NO.getCodeStr());
-//        preSetlmt.setChrgBchno(p.getPatNo() + "_" + p.getTimes());
-//        String ref = JSONObject.toJSONString(preSetlmt);
-//        input.getJSONObject("input").put("data", JSONObject.parseObject(ref));
-//        JSONObject result = exec.executeTrade(input, SiFunction.OUTPATIENT_PRE_SETTLEMENT);
-//        log.info("【操作员：{}】门诊预结算：\n参数：{}，\n结果：{}", p.getStaffId(), input, result);
-//        if (null == result) {
-//            return ResultVoUtil.fail(ExceptionEnum.NETWORK_ERROR);
-//        }
-//        if (null == result.getInteger(RESULT_CODE)) {
-//            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "医保中心报错：" + result.getString("message"));
-//        }
-//        if (result.getIntValue(RESULT_CODE) == 0) {
-//            int mtPartCount = dao.selectMtPartCount(p.getPatNo(), p.getTimes());
-//            if (mtPartCount == 0) {
-//                CssybApplyInfo applyInfo = new CssybApplyInfo();
-//                applyInfo.setPatientId(p.getPatNo());
-//                applyInfo.setTimes(p.getTimes());
-//                applyInfo.setHicNo(preSetlmt.getPsnNo());
-//                applyInfo.setBizType(preSetlmt.getMedType());
-//                applyInfo.setIcdCode("");
-//                applyInfo.setIcdName("");
-//                applyInfo.setMzSerialNo(preSetlmt.getMdtrtId());
-//                dao.insertMtPartInfo(applyInfo);
-//            }
-//            JSONObject setlinfo = result.getJSONObject(OUTPUT).getJSONObject("setlinfo");
-//            FundDetail fundDetail = new FundDetail();
-//            fundDetail.setTotalCost(setlinfo.getString("medfee_sumamt"));
-//            fundDetail.setFundPay(setlinfo.getString("fund_pay_sumamt"));
-//            fundDetail.setCashPay(setlinfo.getString("psn_cash_pay"));
-//            fundDetail.setAcctPay(setlinfo.getString("acct_pay"));
-//            fundDetail.setSelfPay(setlinfo.getString("psn_part_amt"));
-//            return ResultVoUtil.success(fundDetail);
-//        }
-//        return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, result.getString(ERROR_MESSAGE));
     }
 
-//    private ResultVo<FundDetail> getFundDetailResultVo(MzPatientInfo p) {
-//        SiSetlinfo sisetl = dao.selectSettledInfo(p.getPatNo(), p.getTimes());
-//        if (null != sisetl && null != sisetl.getSetlId()) {
-//            FundDetail fundDetail = new FundDetail();
-//            fundDetail.setTotalCost(String.valueOf(sisetl.getMedfeeSumamt()));
-//            fundDetail.setFundPay(String.valueOf(sisetl.getFundPaySumamt()));
-//            fundDetail.setCashPay(String.valueOf(sisetl.getPsnCashPay()));
-//            fundDetail.setAcctPay(String.valueOf(sisetl.getAcctPay()));
-//            fundDetail.setSelfPay(String.valueOf(sisetl.getPsnPartAmt()));
-//            return ResultVoUtil.success(fundDetail);
-//        }
-//        if (null == p.getStaffId()) {
-//            p.setStaffId(TokenUtil.getTokenUserId());
-//        }
-//        return null;
-//    }
-
     public ResultVo<FundDetail> outpatientSettlement(MzPatientInfo p) {
         if (null == p.getStaffId()) {
             p.setStaffId(TokenUtil.getTokenUserId());
         }
         RestTemplate restTemplate = new RestTemplate();
         return restTemplate.postForObject(siFeeUrl + ":1100/mzFee/outpatientSettlement", p, ResultVo.class);
-//        ResultVo<FundDetail> fundDetail1 = getFundDetailResultVo(p);
-//        if (fundDetail1 != null) return fundDetail1;
-//        Setlmt setlmt = dao.selectSetlmt(p.getPatNo(), p.getTimes());
-//        JSONObject input = exec.makeTradeHeaderWithInsureArea(SiFunction.OUTPATIENT_SETTLEMENT, setlmt.getInsuplcAdmdvs());
-//        setlmt.setMdtrtCertType(MdtrtCertType.RESIDENT_IDENTITY_CARD.getCode());
-//        setlmt.setMedfeeSumamt(setlmt.getMedfeeSumamt().setScale(2, RoundingMode.HALF_UP));
-//        setlmt.setPsnSetlway(PsnSetlWay.SETTLE_BY_ITEMS.getCode());
-//        setlmt.setChrgBchno(p.getPatNo() + "_" + p.getTimes());
-//        setlmt.setAcctUsedFlag(YesOrNo.NO.getCodeStr());
-//        setlmt.setInvono(SnowFlakeId.instance().nextId());
-//        String ref = JSONObject.toJSONString(setlmt);
-//        input.getJSONObject("input").put("data", JSONObject.parseObject(ref));
-//        JSONObject result = exec.executeTrade(input, SiFunction.OUTPATIENT_SETTLEMENT);
-//        log.info("【操作员：{}】门诊结算：\n参数：{}，\n结果：{}", p.getStaffId(), input, result);
-//        if (null == result) {
-//            return ResultVoUtil.fail(ExceptionEnum.NETWORK_ERROR, "与医保中心的连接出现网络异常！");
-//        }
-//        if (null == result.getInteger(RESULT_CODE)) {
-//            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "医保中心报错：" + result.getString("message"));
-//        }
-//        if (result.getIntValue(RESULT_CODE) == 0) {
-//            JSONObject setlinfo = result.getJSONObject(OUTPUT).getJSONObject("setlinfo");
-//            SiSetlinfo setlEntity = JSONObject.parseObject(setlinfo.toJSONString(), SiSetlinfo.class);
-//            setlEntity.setPatNo(p.getPatNo());
-//            setlEntity.setTimes(p.getTimes());
-//            setlEntity.setLedgerSn(0);
-//            setlEntity.setStaffId(p.getStaffId());
-//            setlEntity.setRevoked(YesOrNo.NO.getCode());
-//            setlEntity.setSetlType(ClrType.OUTPATIENT.getCode());
-//            setlinfoDao.insert(setlEntity);
-//            setlinfoDao.updateSiZyInfoSetlId(p.getPatNo(), p.getTimes(), 0, setlEntity.getSetlId(),
-//                    setlEntity.getMedinsSetlId(), input.getString("msgid"));
-//            JSONArray setldetail = result.getJSONObject(OUTPUT).getJSONArray("setldetail");
-//            for (int i = 0; i < setldetail.size(); i++) {
-//                SiSetldetail setldetailEntity = JSONObject.parseObject(setldetail.getJSONObject(i).toJSONString(), SiSetldetail.class);
-//                setldetailEntity.setPatNo(p.getPatNo());
-//                setldetailEntity.setTimes(p.getTimes());
-//                setldetailEntity.setLedgerSn(0);
-//                setldetailDao.insert(setldetailEntity);
-//            }
-//            FundDetail fundDetail = new FundDetail();
-//            fundDetail.setTotalCost(String.valueOf(setlEntity.getMedfeeSumamt()));
-//            fundDetail.setFundPay(String.valueOf(setlEntity.getFundPaySumamt()));
-//            fundDetail.setCashPay(String.valueOf(setlEntity.getPsnCashPay()));
-//            fundDetail.setAcctPay(String.valueOf(setlEntity.getAcctPay()));
-//            fundDetail.setSelfPay(String.valueOf(setlEntity.getPsnPartAmt()));
-//            return ResultVoUtil.success(fundDetail);
-//        }
-//        return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, result.getString(ERROR_MESSAGE));
     }
 
     public ResultVo<String> revokeOutpatientSettlement(MzPatientInfo p) {
@@ -578,41 +292,5 @@ public class SiMzService {
         }
         RestTemplate restTemplate = new RestTemplate();
         return restTemplate.postForObject(siFeeUrl + ":1100/mzFee/revokeOutpatientSettlement", p, ResultVo.class);
-//        if (null == p.getTimes()) {
-//            p.setTimes(dao.selectMaxTimes(p.getPatNo()));
-//        }
-//        if (null == p.getStaffId()) {
-//            p.setStaffId(TokenUtil.getTokenUserId());
-//        }
-//        QueryWrapper<SiSetlinfo> wrapper = new QueryWrapper<>();
-//        wrapper.eq("pat_no", p.getPatNo());
-//        wrapper.eq("times", p.getTimes());
-//        wrapper.eq("revoked", 0);
-//        SiSetlinfo setlinfo = setlinfoDao.selectOne(wrapper);
-//        if (null == setlinfo) {
-//            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "此患者没有有效的结算信息。");
-//        }
-//        JSONObject input = exec.makeTradeHeaderWithInsureArea(SiFunction.REVOKE_OUTPATIENT_SETTLEMENT,
-//                dao.selectAdmdvs(setlinfo.getPatNo(), setlinfo.getTimes(), setlinfo.getLedgerSn()));
-//        JSONObject data = new JSONObject();
-//        data.put("setl_id", setlinfo.getSetlId());
-//        data.put("mdtrt_id", setlinfo.getMdtrtId());
-//        data.put("psn_no", setlinfo.getPsnNo());
-//        input.getJSONObject("input").put("data", data);
-//        JSONObject result = exec.executeTrade(input, SiFunction.REVOKE_OUTPATIENT_SETTLEMENT);
-//        log.info("【操作员：{}】门诊结算撤销：\n参数：{}，\n结果：{}", p.getStaffId(), input, result);
-//        if (null == result) {
-//            return ResultVoUtil.fail(ExceptionEnum.NETWORK_ERROR);
-//        }
-//        if (null == result.getInteger(RESULT_CODE)) {
-//            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "医保中心报错：" + result.getString("message"));
-//        }
-//        if (result.getIntValue(RESULT_CODE) == 0) {
-//            dao.deleteSetlInfo(p.getPatNo(), p.getTimes());
-//            dao.deleteSetlDetail(p.getPatNo(), p.getTimes());
-//            dao.updateRvkSetlMsgid(p.getPatNo(), p.getTimes(), input.getString("msgid"));
-//            return ResultVoUtil.success("门诊结算撤销成功。");
-//        }
-//        return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, result.getString(ERROR_MESSAGE));
     }
 }

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

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import thyyxxk.webserver.config.exception.ExceptionEnum;
 import thyyxxk.webserver.constants.sidicts.SiFunction;
@@ -1071,4 +1070,8 @@ public class SiQueryService {
         lst.setMedsrvcThrd(map.get("othThrd"));
         lst.setMedsrvcScnd(map.get("othScnd"));
     }
+
+    public ResultVo<List<SiMzMatnDise>> queryMzMatnDises() {
+        return ResultVoUtil.success(dao.selectAllMzMatnDises());
+    }
 }

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

@@ -185,99 +185,6 @@ public class SiZyService {
         return template.postForObject(siFeeUrl + ":1000/zyFee/upload", o, ResultVo.class);
     }
 
-//    public ResultVo<String> uploadFeeDetail(Overview o) {
-//        SiPatInfo siPatInfo = qrydao.selectSiPatInfoForZy(o.getInpatientNo(), o.getAdmissTimes(), o.getLedgerSn());
-//        if (null == siPatInfo || StringUtil.isBlank(siPatInfo.getMdtrtId())) {
-//            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "此患者没有有效的医保在院信息！");
-//        }
-//        settleService.beforeUpload(o);
-//        dao.hisRecount(o.getInpatientNo(), o.getAdmissTimes(), o.getLedgerSn());
-//        o.setStaffId(TokenUtil.getTokenUserId());
-//        ZyPatientInfo p = dao.selectPatientInfo(o.getInpatientNo());
-//        p.setSid(o.getSid());
-//        p.setLedgerSn(o.getLedgerSn());
-//        p.setMdtrtId(siPatInfo.getMdtrtId());
-//        p.setPsnNo(siPatInfo.getPsnNo());
-//        p.setMedType(siPatInfo.getMedType());
-//        p.setAdmdvs(siPatInfo.getInsuplcAdmdvs());
-//        String today = getTodayEndTime();
-//        Queue<FeeDtle> allPositiveFees = dao.selectNotUploadedPositiveFees(o.getInpatientNo(), o.getAdmissTimes(),
-//                o.getLedgerSn(), today);
-//        allPositiveFees.removeIf(item -> StringUtil.isBlank(item.getMedListCodg()));
-//        Queue<FeeDtle> allNegativeFees = dao.selectNotUploadedNegativeFees(o.getInpatientNo(), o.getAdmissTimes(),
-//                o.getLedgerSn(), today);
-//        if (allPositiveFees.size() == 0 && allNegativeFees.size() == 0) {
-//            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR,
-//                    "此患者没有符合上传条件的费用（上传条件：收费需要匹配，即医保码不能为空；退费需要有对应的收费流水号）。");
-//        }
-//        int index = 0;
-//        int feeSize = allPositiveFees.size() + allNegativeFees.size();
-//        index = prepareUploadFees(allPositiveFees, index, feeSize, p, o.getSid());
-//        prepareUploadFees(allNegativeFees, index, feeSize, p, o.getSid());
-//        return hospitalizationPreSettlement(p);
-//    }
-//
-//    private int prepareUploadFees(Queue<FeeDtle> feeQueue, int index, int feeSize, ZyPatientInfo p, String sid) {
-//        JSONObject input = exec.makeTradeHeaderWithInsureArea(SiFunction.UPLOAD_HOSPITALIZATION_FEE_DETAILS, p.getAdmdvs());
-//        JSONObject socketMessage = new JSONObject();
-//        socketMessage.put("name", "updateProgress");
-//        socketMessage.put("percentage", 0);
-//        List<FeeDtle> tempList = new ArrayList<>();
-//        while (feeQueue.size() > 0) {
-//            FeeDtle feeDtle = feeQueue.poll();
-//            assert feeDtle != null;
-//            tempList.add(feeDtle);
-//            if (tempList.size() == 100) {
-//                executeUploadFees(input, tempList, p);
-//                tempList.clear();
-//                index += 100;
-//                socketMessage.replace("percentage", makePercentage(index, feeSize));
-//                WebSocketServer.sendMessage(sid, socketMessage.toJSONString());
-//            }
-//        }
-//        if (tempList.size() > 0) {
-//            executeUploadFees(input, tempList, p);
-//            index += tempList.size();
-//            socketMessage.replace("percentage", makePercentage(index, feeSize));
-//            WebSocketServer.sendMessage(sid, socketMessage.toJSONString());
-//        }
-//        return index;
-//    }
-//
-//    private int makePercentage(int index, int size) {
-//        float per = (float)index / (float)size;
-//        return (int) (per * 100);
-//    }
-//
-//    private void executeUploadFees(JSONObject input, List<FeeDtle> fees, ZyPatientInfo p) {
-//        String ref = JSONArray.toJSONString(fees);
-//        input.getJSONObject("input").put("feedetail", JSONArray.parse(ref));
-//        JSONObject result = exec.executeTrade(input, SiFunction.UPLOAD_HOSPITALIZATION_FEE_DETAILS);
-//        log.info("【操作员：{}】，医保费用上传：\n参数：{}，\n结果：{}", TokenUtil.getTokenUserId(), input, result);
-//        if (null != result) {
-//            if (result.getIntValue(RESULT_CODE) == 0) {
-//                dao.updateTransFlag(p.getInpatientNo(), p.getAdmissTimes(), fees);
-//                JSONArray array = result.getJSONObject(OUTPUT).getJSONArray("result");
-//                for (int i = 0; i < array.size(); i++) {
-//                    JSONObject upldretrn = array.getJSONObject(i);
-//                    SiChargeTemp chrgtemp = JSONObject.parseObject(upldretrn.toJSONString(), SiChargeTemp.class);
-//                    chrgtemp.setPatNo(p.getInpatientNo());
-//                    chrgtemp.setTimes(p.getAdmissTimes());
-//                    chrgtemp.setLedgerSn(p.getLedgerSn());
-//                    chrgtmpdao.insert(chrgtemp);
-//                }
-//            } else {
-//                String message = result.getString(ERROR_MESSAGE);
-//                JSONObject socketMsg = new JSONObject();
-//                socketMsg.put("name", "uploadFeeResponse");
-//                socketMsg.put("inpatientNo", p.getInpatientNo());
-//                socketMsg.put("patientName", p.getName());
-//                socketMsg.put("msg", message);
-//                WebSocketServer.sendMessage(p.getSid(), socketMsg.toJSONString());
-//            }
-//        }
-//    }
-
     private String getTodayEndTime() {
         SimpleDateFormat smdate = new SimpleDateFormat("yyyy-MM-dd");
         String date = smdate.format(new Date());

src/main/resources/application.yml

@@ -64,7 +64,7 @@ hrg-api-url: http://webhis.thyy.cn:81/thmz/api/v1
 powersi-api-url: http://172.16.32.183:8916/mmg-gateway
 triage-notify-url: http://localhost:8083/triage/roomScreen/pushMsg
 si-tj-url: http://jkglcsx.server.zhongmeihealth.com/openInter
-si-fee-url: http://172.16.32.166
+si-fee-url: http://172.16.30.26
 si-gs-url: http://172.16.30.26:2000/siInjury
 si-gsfee-url: http://172.16.30.26:2100/siInjury/uploadFee