第三医院版本开发

business/base-service/pom.xml

@@ -188,6 +188,11 @@
            <version>${version.commons-io}</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>net.java.dev.jna</groupId>
            <artifactId>jna</artifactId>
            <version>5.7.0</version>
        </dependency>
        <dependency>
            <groupId>com.google.code.kaptcha</groupId>
            <artifactId>kaptcha</artifactId>

business/base-service/src/main/java/com/yihu/jw/order/BusinessOrderService.java

@@ -1901,8 +1901,8 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
                operatorId = "hlwyy";
                operatorName = "互联网医院";
            }else if(wechatId.equalsIgnoreCase("xm_dsyy_wx")){
                operatorId = "1521";
                operatorName = "林福龙";
                operatorId = "HLWCS";
                operatorName = "互联网医院";
            }
            response = ylzPayService.recharge(operatorId,operatorName,cardType,"01",cardNo,idcard,depositType,price,businessOrderDO.getOrderNo(),openId,patientDO.getName(),notifyUrl);
            if (depositType.equalsIgnoreCase("WX_QR")){
@@ -2010,8 +2010,8 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
                operatorId = "hlwyy";
                operatorName = "互联网医院";
            }else if(wechatId.equalsIgnoreCase("xm_dsyy_wx")){
                operatorId = "1521";
                operatorName = "林福龙";
                operatorId = "HLWCS";
                operatorName = "互联网医院";
            }
            response = ylzPayService.recharge(operatorId,operatorName,cardType,"01",cardNo,idcard,depositType,price,businessOrderDO.getOrderNo(),openId,patientDO.getName(),notifyUrl);
            if (depositType.equalsIgnoreCase("WX_QR")){
@@ -2091,8 +2091,8 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
                operatorId = "hlwyy";
                operatorName = "互联网医院";
            }else if(wechatId.equalsIgnoreCase("xm_dsyy_wx")){
                operatorId = "1521";
                operatorName = "林福龙";
                operatorId = "HLWCS";
                operatorName = "互联网医院";
            }
            response = ylzPayService.recharge(operatorId,operatorName,cardType,"01",cardNo,idcard,depositType,price,businessOrderDO.getOrderNo(),openId,patientDO.getName(),notifyUrl);
            if (depositType.equalsIgnoreCase("WX_QR")){

business/base-service/src/main/java/com/yihu/jw/utils/dsyyUtil/ZyXmyytRequestServiceu.java

@@ -0,0 +1,10 @@
package com.yihu.jw.utils.dsyyUtil;
import com.sun.jna.Library;
import com.sun.jna.Native;
public interface ZyXmyytRequestServiceu extends Library {
	ZyXmyytRequestServiceu mydll = Native.load("ZyXmyytRequestServiceu.dll",ZyXmyytRequestServiceu.class);
	int CallYYTServerService(String ServerInfo,String RegMsg,String strAnsMsg,String ErrInfo);
 }

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/prescription/PrescriptionEndpoint.java

@@ -385,12 +385,9 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
                                           @ApiParam(name = "prescriptionId", value = "处方ID")
                                           @RequestParam(value = "prescriptionId", required = false) String prescriptionId) throws Exception {
        try {
            com.alibaba.fastjson.JSONObject obj = prescriptionService.findReOutpatientInfo(outpatientId, prescriptionId, wxId);
            return success(obj);
        } catch (Exception e) {
            return failedObjEnvelopException(e);
        }
        com.alibaba.fastjson.JSONObject obj = prescriptionService.findReOutpatientInfo(outpatientId, prescriptionId, wxId);
        return success(obj);
    }
    @GetMapping(value = BaseHospitalRequestMapping.Prescription.findPrescriptionInfo)