第三医院版本开发

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/DsyyEntranceService.java

@@ -1701,7 +1701,7 @@ public class DsyyEntranceService {
     * @return
     * @throws Exception
     */
    public String getSettlement(String cardNo,String cardType,String xtgzh0,String operatorId,String operatorName,String termNo) throws  Exception{
    public String getSettlement(String cardNo,String cardType,String xtgzh0,String hismzlsh,String operatorId,String operatorName,String termNo) throws  Exception{
        String api = "query_recipe_gjyb";
        String msgHeader ="<?xml version=\"1.0\" encoding=\"utf-8\"?> " +
                "<root> " +
@@ -1731,6 +1731,10 @@ public class DsyyEntranceService {
        if (StringUtils.isNoneBlank(termNo)){
            object.put("termNo",termNo);
        }
        if (StringUtils.isNoneBlank(hismzlsh)){
            object.put("hismzlsh",hismzlsh);
        }
        object.put("accountType","01");
        condition = object.toJSONString();
        String msgBody =condition;
        Map<String,String> params = new HashedMap();
@@ -1989,7 +1993,7 @@ public class DsyyEntranceService {
     * @throws Exception
     */
    public String queryDayDetailList(String operatorId ,String operatorName,String termNo,String orgCode,String iptNo,String patientId,
                                     String beginDate,String endData) throws  Exception{
                                     String beginDate,String endData,String cardNo) throws  Exception{
        String api = "query_day_detail_list";
        String msgHeader ="<?xml version=\"1.0\" encoding=\"utf-8\"?> " +
                "<root> " +
@@ -2004,6 +2008,9 @@ public class DsyyEntranceService {
        if (StringUtils.isNoneBlank(operatorId)){
            object.put("operatorId",operatorId);
        }
        if (StringUtils.isNoneBlank(cardNo)){
            object.put("cardNo",cardNo);
        }
        if (StringUtils.isNoneBlank(operatorName)){
            object.put("operatorName",operatorName);
        }

svr/svr-internet-hospital-entrance/src/main/java/com/yihu/jw/entrance/controller/DsyyController.java

@@ -166,13 +166,15 @@ public class DsyyController extends EnvelopRestEndpoint {
                                    @RequestParam(value = "cardType",required = false)String cardType,
                                    @ApiParam(name = "xtgzh0", value = "单据号", required = false)
                                        @RequestParam(value = "xtgzh0",required = false)String xtgzh0,
                                    @ApiParam(name = "hismzlsh", value = "挂号号", required = false)
                                        @RequestParam(value = "hismzlsh",required = false)String hismzlsh,
                                    @ApiParam(name = "operatorId", value = "操作者id", required = false)
                                        @RequestParam(value = "operatorId",required = false)String operatorId,
                                    @ApiParam(name = "operatorName", value = "操作者姓名", required = false)
                                        @RequestParam(value = "operatorName",required = false)String operatorName,
                                    @ApiParam(name = "termNo", value = "终端编号", required = false)
                                        @RequestParam(value = "termNo",required = false)String termNo) throws Exception {
        return success("请求成功",dsyyEntranceService.getSettlement(cardNo,cardType,xtgzh0,operatorId,operatorName,termNo));
        return success("请求成功",dsyyEntranceService.getSettlement(cardNo,cardType,xtgzh0,hismzlsh,operatorId,operatorName,termNo));
    }
    @PostMapping(value = "/confirmPayGjyb")
@@ -300,9 +302,11 @@ public class DsyyController extends EnvelopRestEndpoint {
                                   @ApiParam(name = "beginDate", value = "开始日期 20230801不能为空", required = false)
                                   @RequestParam(value = "beginDate",required = false)String beginDate,
                                   @ApiParam(name = "endData", value = "截止日期 可为空", required = false)
                                   @RequestParam(value = "endData",required = false)String endData) throws Exception {
                                   @RequestParam(value = "endData",required = false)String endData,
                                         @ApiParam(name = "cardNo", value = "卡号", required = false)
                                             @RequestParam(value = "cardNo",required = false)String cardNo) throws Exception {
        return success("请求成功",dsyyEntranceService.queryDayDetailList(operatorId ,operatorName,termNo,orgCode,
                iptNo,patientId,beginDate,endData));
                iptNo,patientId,beginDate,endData,cardNo));
    }