Home Explore Help
Register Sign In
Amoy2
/
wlyy2.0
Watch 5
Star 1
Fork 18
Files Issues 0 Pull Requests 0 Wiki
Browse Source

医保凭证开发

wangzhinan 1 year ago
parent
97e0b0611c
commit
53168a525f
9 changed files with 345 additions and 8 deletions
Split View Show Diff Stats
  1. 229 0
      business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/DsyyEntranceService.java
  2. 1 1
      common/common-entity/src/main/java/com/yihu/jw/entity/hospital/healthCare/YlzMedicalRelationDO.java
  3. 7 0
      common/common-util/src/main/java/com/yihu/jw/util/date/DateUtil.java
  4. 55 0
      common/common-util/src/main/java/com/yihu/jw/util/http/HttpClientUtil.java
  5. 4 1
      gateway/ag-basic/src/main/resources/application.yml
  6. 36 0
      svr/svr-internet-hospital-entrance/src/main/java/com/yihu/jw/entrance/controller/DsyyController.java
  7. 5 5
      svr/svr-internet-hospital-entrance/src/main/java/com/yihu/jw/entrance/controller/healthCare/HealthCareEndPoint.java
  8. 4 0
      svr/svr-internet-hospital-entrance/src/main/resources/application.yml
  9. 4 1
      svr/svr-internet-hospital/src/main/resources/application.yml

+ 229 - 0
business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/DsyyEntranceService.java
View File 

@ -15,12 +15,20 @@ import com.yihu.jw.entity.base.doctor.BaseDoctorHospitalDO;
 
import com.yihu.jw.entity.base.doctor.BaseDoctorRoleDO;
 
import com.yihu.jw.entity.base.patient.BasePatientDO;
 
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
 
import com.yihu.jw.entity.hospital.healthCare.YlzMedicalIcdDO;
 
import com.yihu.jw.entity.hospital.healthCare.YlzMedicalMxDO;
 
import com.yihu.jw.entity.hospital.healthCare.YlzMedicalRelationDO;
 
import com.yihu.jw.entity.hospital.healthCare.YlzMedicalRelationInvoiceDO;
 
import com.yihu.jw.entity.hospital.httplog.WlyyHttpLogDO;
 
import com.yihu.jw.entity.hospital.mapping.DoctorMappingDO;
 
import com.yihu.jw.entity.hospital.mapping.PatientMappingDO;
 
import com.yihu.jw.entity.hospital.prescription.*;
 
import com.yihu.jw.hospital.dict.WlyyChargeDictDao;
 
import com.yihu.jw.hospital.dict.WlyyHospitalSysDictDao;
 
import com.yihu.jw.hospital.healthCare.YlzMedicailIcdDao;
 
import com.yihu.jw.hospital.healthCare.YlzMedicailMxDao;
 
import com.yihu.jw.hospital.healthCare.YlzMedicailRelationDao;
 
import com.yihu.jw.hospital.healthCare.YlzMedicailRelationInvoiceDao;
 
import com.yihu.jw.hospital.httplog.dao.WlyyHttpLogDao;
 
import com.yihu.jw.hospital.mapping.dao.DoctorMappingDao;
 
import com.yihu.jw.hospital.mapping.dao.PatientMappingDao;
 
@ -42,6 +50,7 @@ import com.yihu.jw.utils.dsyyUtil.ZoesoftHipServiceLocator;
 
import com.yihu.jw.utils.hibernate.HibenateUtils;
 
import com.yihu.jw.wechat.dao.BasePatientWechatDao;
 
import net.sf.json.xml.XMLSerializer;
 
import org.apache.commons.codec.binary.Base64;
 
import org.apache.commons.collections.map.HashedMap;
 
import org.apache.commons.lang3.StringUtils;
 
import org.slf4j.Logger;
 
@ -57,6 +66,7 @@ import org.springframework.transaction.annotation.Transactional;
 
import java.io.BufferedReader;
 
import java.io.InputStream;
 
import java.io.InputStreamReader;
 
import java.io.UnsupportedEncodingException;
 
import java.text.SimpleDateFormat;
 
import java.util.*;
 
import java.util.stream.Collectors;
 
@ -128,6 +138,14 @@ public class DsyyEntranceService {
 
    private HibenateUtils hibenateUtils;
 
    @Autowired
 
    private OauthCaConfigDao oauthCaConfigDao;
 
    @Autowired
 
    private YlzMedicailIcdDao ylzMedicailIcdDao;
 
    @Autowired
 
    private YlzMedicailMxDao ylzMedicailMxDao;
 
    @Autowired
 
    private YlzMedicailRelationInvoiceDao invoiceDao;
 
    @Autowired
 
    private YlzMedicailRelationDao ylzMedicailRelationDao;
 
    private static String key="bvvsf3JA0mUXMU+mVnMaOQ==";
 
@ -2638,4 +2656,215 @@ public class DsyyEntranceService {
 
    //===========================CA签名==================================
 
    //============================电子发票开始====================================
 
    String dsfp = "http://10.95.8.94:20017/service/invoice/perform";
 
    String appId ="862e18c18c5e4d72";
 
    String appKey ="d756d7778c43e3c5b8bbcb301c48fe25";
 
    String msgNo ="8901";
 
    String organ = "401039";
 
    String user = "hisbizadmin";
 
    public String getAccessToken() throws Exception {
 
        String msg = "<Voucher>\n" +
 
                "<AppId>"+appId+"</AppId>\n" +
 
                "<AppKey>"+appKey+"</AppKey>\n" +
 
                "</Voucher>";
 
        String randomStr = System.currentTimeMillis()+(int)(Math.random()*900)+100+"";
 
        String params ="<?xml version='1.0' encoding='UTF-8'?>\n" +
 
                "<Invoice>\n" +
 
                "<Head>\n" +
 
                "<MsgNo>"+msgNo+"</MsgNo>\n" +
 
                "<Organ>"+organ+"</Organ>\n" +
 
                "<User>"+user+"</User>\n" +
 
                "<Version>1.0</Version>\n" +
 
                "<AppId>"+appId+"</AppId>\n" +
 
                "<MsgId>5676"+randomStr+"</MsgId>\n" +
 
                "<MsgRef>5676"+randomStr+"</MsgRef>\n" +
 
                "<DateTime>"+new Date().getTime()+"</DateTime>\n" +
 
                "<Reserve></Reserve>\n" +
 
                "</Head>\n" +
 
                "<Msg>"+ Base64.encodeBase64String(msg.getBytes("utf-8"))+"</Msg>\n" +
 
                "</Invoice>";
 
        logger.info("请求前入参："+params);
 
        String result = httpClientUtil.sendPost(dsfp,params);
 
        logger.info("请求结果："+result);
 
        return result;
 
    }
 
    /**
 
     * 电子票据开具
 
     * @param ylzMedicalRelationDO
 
     * @return
 
     * @throws Exception
 
     */
 
    public String dsfpkj(String id) throws Exception {
 
        YlzMedicalRelationDO ylzMedicalRelationDO = ylzMedicailRelationDao.findById(id).get();
 
        WlyyOutpatientDO outpatientDO = outpatientDao.findById(ylzMedicalRelationDO.getRelationCode()).get();
 
        BasePatientDO patientDO = basePatientDao.findById(outpatientDO.getPatient()).get();
 
        PatientMappingDO patientMappingDO = patientMappingDao.findByPatient(patientDO.getId());
 
        String diseases = " <DiseaseDetails>";
 
        List<YlzMedicalIcdDO> icdDOS = ylzMedicailIcdDao.findByMedicalId(ylzMedicalRelationDO.getId());
 
        for (int i=0;i<icdDOS.size();i++){
 
            YlzMedicalIcdDO icdDO = icdDOS.get(0);
 
            diseases +="<DiseaseItem>" +
 
                    "<DiseaseCode>"+icdDO.getDiseaseCodeIcd10()+"</DiseaseCode>" +
 
                    "<DiseaseName>"+icdDO.getDiseaseNameIcd10()+"</DiseaseName>" +
 
                    "<DiseaseFlag>"+(i+1)+"</DiseaseFlag>" +
 
                    "</DiseaseItem>" ;
 
        }
 
        diseases+="</DiseaseDetails>";
 
        String mxInfos = "<Details>";
 
        List<YlzMedicalMxDO> mxDOList = ylzMedicailMxDao.findByMedicalId(ylzMedicalRelationDO.getId());
 
        for (YlzMedicalMxDO mxDO:mxDOList){
 
            mxInfos +="<Item>\n" +
 
                    "<ItemCode>"+mxDO.getItemCode()+"</ItemCode>\n" +
 
                    "<ItemName>"+mxDO.getItemName()+"</ItemName>\n" +
 
                    "<ItemAmount>"+mxDO.getTotalMoney()+"</ItemAmount>\n" +
 
                    "<ItemQuantity>"+mxDO.getAmount()+"</ItemQuantity>\n" +
 
                    "<ItemStd>1.00</ItemStd>\n" +
 
                    "<InsuranceItemCode>"+mxDO.getHisItemCode()+"</InsuranceItemCode>\n" +
 
                    "</Item>\n" ;
 
        }
 
        mxInfos += "</Details>";
 
        String msg = "<Voucher>\n" +
 
                "<Main>\n" +
 
                "<RandomNumber>123456</RandomNumber>\n" +
 
                "<TotalAmount>"+ylzMedicalRelationDO.getTotalAmount()+"</TotalAmount>\n" +
 
                "<IssueDate>"+DateUtil.dateToStrFormatShort(ylzMedicalRelationDO.getSettleDate())+"</IssueDate>\n" +
 
                "<IssueTime>"+DateUtil.getTimeShort(ylzMedicalRelationDO.getSettleDate())+"</IssueTime>\n" +
 
                "<InvoicingParty>\n" +
 
                "<InvoicingPartyCode>401039</InvoicingPartyCode>\n" +
 
                "<InvoicingPartyName>厦门市第三医院</InvoicingPartyName>\n" +
 
                "</InvoicingParty>\n" +
 
                "<PayerPartyType>1</PayerPartyType>\n" +
 
                "<PayMode></PayMode>\n" +
 
                "<BizCode>2020071922123</BizCode>\n" +
 
                "<HandlingPerson>陈少娟</HandlingPerson>\n" +
 
                "<MainExt>\n" +
 
                "<MedicalType>门诊</MedicalType>\n" +
 
                "<PatientNumber>"+ylzMedicalRelationDO.getHisSerial()+"</PatientNumber>\n" +
 
                "<OrgType>三级乙等</OrgType>\n" +
 
                "<MedicalInsuranceType>医保类型</MedicalInsuranceType>\n" +
 
                "<MedicalInsuranceID>"+ylzMedicalRelationDO.getInsuranceSerial()+"</MedicalInsuranceID>\n" +
 
                "<FundPayAmount>"+ylzMedicalRelationDO.getFundPrice()+"</FundPayAmount>\n" +
 
                "<OtherPayAmount>"+ylzMedicalRelationDO.getOtherPay()+"</OtherPayAmount>\n" +
 
                "<AccountPayAmount>"+ylzMedicalRelationDO.getPersonAccount()+"</AccountPayAmount>\n" +
 
                "<OwnPayAmount>"+ylzMedicalRelationDO.getPersonCash()+"</OwnPayAmount>\n" +
 
                "<SelfpaymentAmount>"+ylzMedicalRelationDO.getPersonCash()+"</SelfpaymentAmount>\n" +
 
                "<CaseNumber>无</CaseNumber>\n" +
 
                "<PrepaidAmount>"+ylzMedicalRelationDO.getBalance()+"</PrepaidAmount>\n" +
 
                "<RechargeAmount>8</RechargeAmount>\n" +
 
                "<RefundAmount>0</RefundAmount>\n" +
 
                "<Age>"+patientDO.getAge()+"</Age>\n" +
 
                "<InsuranceSettleNo>"+ylzMedicalRelationDO.getInsuranceSerial()+"</InsuranceSettleNo>\n" +
 
                "<VisitDeptName>"+ylzMedicalRelationDO.getDeptName()+"</VisitDeptName>\n" +
 
                "<VisitDeptCode>"+ylzMedicalRelationDO.getDeptCode()+"</VisitDeptCode>\n" +
 
                "<MedicalAccountPayment>"+ylzMedicalRelationDO.getPersonAccount()+"</MedicalAccountPayment>\n" +
 
                "<HealthAccountPay>"+ylzMedicalRelationDO.getPersonAccount()+"</HealthAccountPay>\n" +
 
                "<MasonicAccountPay>"+ylzMedicalRelationDO.getJtgjPay()+"</MasonicAccountPay>\n" +
 
                "<MedicalAccountBalance>"+ylzMedicalRelationDO.getAccountBalance()+"</MedicalAccountBalance>\n" +
 
                "<HealthAccountBalance>0</HealthAccountBalance>\n" +
 
                "<MedicalAssistance>"+ylzMedicalRelationDO.getYljzPay()+"</MedicalAssistance>\n" +
 
                "<IllnessInsure>0</IllnessInsure>\n" +
 
                "<HealthCareFund>"+ylzMedicalRelationDO.getOtherPay()+"</HealthCareFund>\n" +
 
                "<CivilServantSubsidy>"+ylzMedicalRelationDO.getGwyPay()+"</CivilServantSubsidy>\n" +
 
                "<HospitalRelief>0</HospitalRelief>\n" +
 
                "<RefundableAmount>0</RefundableAmount>\n" +
 
                "<OverCapPay>0</OverCapPay>\n" +
 
                "<PrepaidBalance>"+ylzMedicalRelationDO.getBalance()+"</PrepaidBalance>\n" +
 
                "<TimesOfMonth>0</TimesOfMonth>\n" +
 
                "<MedicalDate>"+DateUtil.dateToStrFormatShort(ylzMedicalRelationDO.getDate())+"</MedicalDate>\n" +
 
                "<FamilyMasonicAccountBalance>0</FamilyMasonicAccountBalance> " +
 
                "<PreSelfPay>0</PreSelfPay>\n" +
 
                "<SelfpaymentCost>"+ylzMedicalRelationDO.getPersonCash()+"</SelfpaymentCost>\n" +
 
                "<UploadSource>2</UploadSource>\n" +
 
                "<VisitType>1</VisitType>\n" +
 
                "<SettlementNo>"+ylzMedicalRelationDO.getHisSettleNo()+"</SettlementNo>\n" +
 
                "<SickName>"+ylzMedicalRelationDO.getName()+"</SickName>\n" +
 
                "<WorkInjuredPay>0</WorkInjuredPay>\n" +
 
                diseases+
 
                "<SickId>"+patientMappingDO.getMappingCode()+"</SickId>" +
 
                "<CardInfos>\n" +
 
                "<CardInfo>\n" +
 
                "<CardType>4</CardType>\n" +
 
                "</CardInfo>\n" +
 
                "</CardInfos>\n" +
 
                "</PayerPartyExt>\n" +
 
                "<AccountBalanceInfo>"+ylzMedicalRelationDO.getAccountBalance()+"</AccountBalanceInfo>\n" +
 
                "<CardNum>"+outpatientDO.getCardNo()+"</CardNum>\n" +
 
                "<MedicareDist></MedicareDist>\n" +
 
                "</MainExt>\n" +
 
                "</Main>\n" +
 
                mxInfos+
 
                "</Voucher>";
 
        String randomStr = System.currentTimeMillis()+(int)(Math.random()*900)+100+"";
 
        String params ="<?xml version='1.0' encoding='UTF-8'?>\n" +
 
                "<Invoice>\n" +
 
                "<Head>\n" +
 
                "<MsgNo>"+msgNo+"</MsgNo>\n" +
 
                "<Organ>"+organ+"</Organ>\n" +
 
                "<User>"+user+"</User>\n" +
 
                "<Version>1.0</Version>\n" +
 
                "<AppId>"+appId+"</AppId>\n" +
 
                "<AccessToken>aaaabbbbb11111333333</AccessToken>"+
 
                "<AppId>862e18c18c5e4d72</AppId>\n" +
 
                "<MsgId>5676"+randomStr+"</MsgId>\n" +
 
                "<MsgRef>5676"+randomStr+"</MsgRef>\n" +
 
                "<DateTime>"+new Date().getTime()+"</DateTime>\n" +
 
                "<Reserve></Reserve>\n" +
 
                "</Head>\n" +
 
                "<Msg>"+ Base64.encodeBase64String(msg.getBytes("utf-8"))+"</Msg>\n" +
 
                "</Invoice>";
 
        logger.info("开具电子发票入参："+params);
 
        String result = httpClientUtil.sendPost(dsfp,params);
 
        logger.info("开具电子发票请求结果："+result);
 
        return result;
 
    }
 
    /**
 
     * 下载电子发票
 
     * @param medicalId
 
     * @return
 
     * @throws Exception
 
     */
 
    public String queryDzfp(String medicalId) throws Exception {
 
        YlzMedicalRelationInvoiceDO invoiceDO = invoiceDao.findByMedicalId(medicalId);
 
        String msg = "<Voucher>\n" +
 
                "<AgencyCode>401039</AgencyCode>\n" +
 
                "<AgencyName>厦门市第三医院</AgencyName>\n" +
 
                "<EInvoiceCode>"+invoiceDO.getInvoiceCode()+"</EInvoiceCode>\n" +
 
                "<EInvoiceNumber>"+invoiceDO.getInvoiceSerialNum()+"</EInvoiceNumber>\n" +
 
                "<RandomNumber>"+invoiceDO.getInvoiceNo()+"</RandomNumber>\n" +
 
                "</Voucher>\n";
 
        String randomStr = System.currentTimeMillis()+(int)(Math.random()*900)+100+"";
 
        String params ="<?xml version='1.0' encoding='UTF-8'?>\n" +
 
                "<Invoice>\n" +
 
                "<Head>\n" +
 
                "<MsgNo>"+msgNo+"</MsgNo>\n" +
 
                "<Organ>"+organ+"</Organ>\n" +
 
                "<User>"+user+"</User>\n" +
 
                "<Version>1.0</Version>\n" +
 
                "<AppId>"+appId+"</AppId>\n" +
 
                "<AccessToken>aaaabbbbb11111333333</AccessToken>"+
 
                "<AppId>862e18c18c5e4d72</AppId>\n" +
 
                "<MsgId>5676"+randomStr+"</MsgId>\n" +
 
                "<MsgRef>5676"+randomStr+"</MsgRef>\n" +
 
                "<DateTime>"+new Date().getTime()+"</DateTime>\n" +
 
                "<Reserve></Reserve>\n" +
 
                "</Head>\n" +
 
                "<Msg>"+ Base64.encodeBase64String(msg.getBytes("utf-8"))+"</Msg>\n" +
 
                "</Invoice>";
 
        logger.info("开具电子发票入参："+params);
 
        String result = httpClientUtil.sendPost(dsfp,params);
 
        logger.info("开具电子发票请求结果："+result);
 
        return result;
 
    }
 
    //=============================电子发票结束===================================
 
}

+ 1 - 1
common/common-entity/src/main/java/com/yihu/jw/entity/hospital/healthCare/YlzMedicalRelationDO.java
View File 

@ -412,7 +412,7 @@ public class YlzMedicalRelationDO extends UuidIdentityEntity {
 
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
 
    @Column(name="date")
 
    @Column(name="reality_date")
 
    public Date getDate() {
 
        return date;
 
    }

+ 7 - 0
common/common-util/src/main/java/com/yihu/jw/util/date/DateUtil.java
View File 

@ -307,6 +307,13 @@ public class DateUtil {
 
        return dateToStringLong(currentTime,HH_MM_SS);
 
    }
 
    /**
 
     * 获取时间 小时:分;秒 HH:mm:ss
 
     */
 
    public static String getTimeShort(Date date) {
 
        return dateToStringLong(date,HH_MM_SS);
 
    }
 
    /**
 
     * 将长时间格式字符串转换为时间 yyyy-MM-dd HH:mm:ss
 
     */

+ 55 - 0
common/common-util/src/main/java/com/yihu/jw/util/http/HttpClientUtil.java
View File 

@ -358,6 +358,61 @@ public class HttpClientUtil {
 
        }
 
        return buffer.toString();
 
    }
 
    /**
 
     * 向指定 URL 发送POST方法的请求
 
     *
 
     * @param url
 
     *            发送请求的 URL带上参数
 
     * @param param
 
     *            POST参数。
 
     * @return 所代表远程资源的响应结果
 
     */
 
    public static  String sendPostXml(String url, String param) {
 
        StringBuffer buffer = new StringBuffer();
 
        PrintWriter out = null;
 
        BufferedReader in = null;
 
        HttpURLConnection conn = null;
 
        try {
 
            URL realUrl = new URL(url);
 
            // 打开和URL之间的连接
 
            conn = (HttpURLConnection) realUrl.openConnection();
 
            conn.setRequestMethod("POST");
 
            conn.setDoOutput(true);
 
            conn.setDoInput(true);
 
            conn.setUseCaches(false);
 
            conn.setRequestProperty("Content-Type", "application/xml");
 
            conn.setRequestProperty("accept", "*/*");
 
            conn.setRequestProperty("connection", "Keep-Alive");
 
            conn.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
 
            OutputStreamWriter osw = new OutputStreamWriter(conn.getOutputStream(), "UTF-8");
 
            osw.write(param.toString());
 
            osw.flush();
 
            // 读取返回内容
 
            BufferedReader br = new BufferedReader(new InputStreamReader(conn.getInputStream(), "UTF-8"));
 
            String temp;
 
            while ((temp = br.readLine()) != null) {
 
                buffer.append(temp);
 
                buffer.append("\n");
 
            }
 
        } catch (Exception e) {
 
            e.printStackTrace();
 
        } finally {
 
            try {
 
                if (out != null) {
 
                    out.close();
 
                }
 
                if (in != null) {
 
                    in.close();
 
                }
 
            } catch (IOException ex) {
 
                ex.printStackTrace();
 
            }
 
        }
 
        return buffer.toString();
 
    }
 
    
    public  String postBody(String url, com.alibaba.fastjson.JSONObject params) {
 
        RestTemplate restTemplate = new RestTemplate();

+ 4 - 1
gateway/ag-basic/src/main/resources/application.yml
View File 

@ -30,7 +30,10 @@ spring:
 
      max-idle: 8 # Max number of "idle" connections in the pool. Use a negative value to indicate an unlimited number of idle connections.
 
      max-wait: -1 # Maximum amount of time (in milliseconds) a connection allocation should block before throwing an exception when the pool is exhausted. Use a negative value to block indefinitely.
 
      min-idle: 1 # Target for the minimum number of idle connections to maintain in the pool. This settings only has an effect if it is positive.
 
  servlet:
 
    multipart:
 
      max-file-size: 60MB
 
      max-request-size: 60MB
 
hystrix:
 
  command:
 
    default:

+ 36 - 0
svr/svr-internet-hospital-entrance/src/main/java/com/yihu/jw/entrance/controller/DsyyController.java
View File 

@ -245,4 +245,40 @@ public class DsyyController extends EnvelopRestEndpoint {
 
        }
 
        return Envelop.getError("发送失败");
 
    }
 
    @GetMapping(value = "/getAccessToken")
 
    @ApiOperation(value = "电子发票获取授权")
 
    public Envelop getAccessToken() throws Exception {
 
        try {
 
            return success(dsyyEntranceService.getAccessToken());
 
        }catch (Exception e){
 
            e.printStackTrace();
 
        }
 
        return Envelop.getError("发送失败");
 
    }
 
    @GetMapping(value = "/dsfpkj")
 
    @ApiOperation(value = "电子发票开具")
 
    public Envelop dsfpkj(@ApiParam(name = "id", value = "结算id", required = false)
 
                                      @RequestParam(value = "id",required = false)String id) throws Exception {
 
        try {
 
            return success(dsyyEntranceService.dsfpkj(id));
 
        }catch (Exception e){
 
            e.printStackTrace();
 
        }
 
        return Envelop.getError("发送失败");
 
    }
 
    @GetMapping(value = "/queryDzfp")
 
    @ApiOperation(value = "电子发票查询")
 
    public Envelop queryDzfp(@ApiParam(name = "id", value = "结算id", required = false)
 
                                      @RequestParam(value = "id",required = false)String id) throws Exception {
 
        try {
 
            return success(dsyyEntranceService.queryDzfp(id));
 
        }catch (Exception e){
 
            e.printStackTrace();
 
        }
 
        return Envelop.getError("发送失败");
 
    }
 
}

+ 5 - 5
svr/svr-internet-hospital-entrance/src/main/java/com/yihu/jw/entrance/controller/healthCare/HealthCareEndPoint.java
View File 

@ -154,7 +154,7 @@ public class HealthCareEndPoint extends EnvelopRestEndpoint {
 
    @ApiOperation(value = "2.5.1医保挂号（N20.17.04.01）", notes = "2.5.1医保挂号（N20.17.04.01）")
 
    public ObjEnvelop register(@ApiParam(name = "outpatientId", value = "门诊id", required = true)
 
                               @RequestParam(value = "outpatientId", required = true)String outpatientId)throws Exception{
 
        return ObjEnvelop.getSuccess("ok",healthCareService.register(outpatientId));
 
        return ObjEnvelop.getSuccess("ok",healthCareService.register(outpatientId,null));
 
    }
 
    @GetMapping(value = "/registerBack")
 
@ -168,7 +168,7 @@ public class HealthCareEndPoint extends EnvelopRestEndpoint {
 
    @ApiOperation(value = " 2.5.3医保费用明细上传（N20.17.04.03）", notes = " 2.5.3医保费用明细上传（N20.17.04.03）")
 
    public ObjEnvelop feeDetailUpload(@ApiParam(name = "outpatientId", value = "挂号号", required = true)
 
                                      @RequestParam(value = "outpatientId", required = true)String outpatientId)throws Exception{
 
        return ObjEnvelop.getSuccess("ok",healthCareService.feeDetailUpload(outpatientId));
 
        return ObjEnvelop.getSuccess("ok",healthCareService.feeDetailUpload(outpatientId,null));
 
    }
 
    @GetMapping(value = "/feeDetailRefund")
 
@ -184,7 +184,7 @@ public class HealthCareEndPoint extends EnvelopRestEndpoint {
 
    @ApiOperation(value = " 2.5.5医保预结算服务（N20.17.04.05）", notes = " 2.5.5医保预结算服务（N20.17.04.05）")
 
    public ObjEnvelop preSettlement(@ApiParam(name = "outpatientId", value = "门诊id", required = true)
 
                                    @RequestParam(value = "outpatientId", required = false)String outpatientId)throws Exception{
 
        return ObjEnvelop.getSuccess("ok",healthCareService.preSettlement(outpatientId));
 
        return ObjEnvelop.getSuccess("ok",healthCareService.preSettlement(outpatientId,null));
 
    }
 
    @GetMapping(value = "/preSettlementRefund")
 
@ -198,14 +198,14 @@ public class HealthCareEndPoint extends EnvelopRestEndpoint {
 
    @ApiOperation(value = " 2.5.7获取医保结算页面地址（N20.17.04.07）", notes = " 2.5.7获取医保结算页面地址（N20.17.04.07）")
 
    public ObjEnvelop getSettlementResultUrl(@ApiParam(name = "outpatientId", value = "门诊id", required = true)
 
                                             @RequestParam(value = "outpatientId", required = false)String outpatientId)throws Exception{
 
        return ObjEnvelop.getSuccess("ok",healthCareService.getSettlementResultUrl(outpatientId));
 
        return ObjEnvelop.getSuccess("ok",healthCareService.getSettlementResultUrl(outpatientId,null));
 
    }
 
    @GetMapping(value = "/getSettlementResultUrlBase64")
 
    @ApiOperation(value = " 2.5.7获取医保结算页面地址（N20.17.04.08）", notes = " 2.5.7获取医保结算页面地址（N20.17.04.08）")
 
    public ObjEnvelop getSettlementResultUrlBase64(@ApiParam(name = "outpatientId", value = "门诊id", required = true)
 
                                             @RequestParam(value = "outpatientId", required = false)String outpatientId)throws Exception{
 
        return ObjEnvelop.getSuccess("ok",healthCareService.getSettlementResultUrlBase64(outpatientId));
 
        return ObjEnvelop.getSuccess("ok",healthCareService.getSettlementResultUrlBase64(outpatientId,null));
 
    }
 
    @GetMapping(value = "/getSettlementResult")

+ 4 - 0
svr/svr-internet-hospital-entrance/src/main/resources/application.yml
View File 

@ -24,6 +24,10 @@ spring:
 
    time-between-eviction-runs-millis: 300000 #在空闲连接回收器线程运行期间休眠的时间值,以毫秒为单位，一般比minEvictableIdleTimeMillis小
 
  main:
 
    allow-bean-definition-overriding: true
 
  servlet:
 
    multipart:
 
      max-file-size: 60MB
 
      max-request-size: 60MB
 
  redis:
 
    database: 0 # Database index used by the connection factory.
 
    password: # Login password of the redis server.

+ 4 - 1
svr/svr-internet-hospital/src/main/resources/application.yml
View File 

@ -25,7 +25,10 @@ spring:
 
    allow-bean-definition-overriding: true
 
  #      location: D:/work/soft_dev/IdeaWorkSpace/wlyy2.0/svr/svr-patient/temp_file/
 
  #      resolve-lazily: true
 
  servlet:
 
    multipart:
 
      max-file-size: 60MB
 
      max-request-size: 60MB
 
  redis:
 
    database: 0 # Database index used by the connection factory.
 
    password: # Login password of the redis server.