第三医院版本开发

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

@@ -1373,7 +1373,7 @@ public class DsyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
        //请求his获取待结算存储
        Map<String,Object> params = new HashedMap();
        String url =entranceUrl +"getSettlement";
        params.put("cardType","cardType");
        params.put("cardType",cardType);
        params.put("cardNo",cardno);
        params.put("hismzlsh",outpatientDO.getRegisterNo());
        params.put("operatorId","HLWYY");

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

@@ -14614,8 +14614,9 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        if(outpatientDO==null){
            throw new Exception("门诊信息为空");
        }
        WlyyHospitalSysDictDO sysDictDO = hospitalSysDictDao.findById("ylzConfigOrgCode").get();
        logger.info("获取待结算开始！");
        if (wechatId.equalsIgnoreCase("xm_dsyy_wx")) {
            logger.info("获取待结算开始！=====");
            com.alibaba.fastjson.JSONObject object = new com.alibaba.fastjson.JSONObject();
            logger.info("获取患者待结算信息开始!");
            YlzMedicalRelationDO ylzMedicalRelationDO = new YlzMedicalRelationDO();

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

@@ -2321,6 +2321,25 @@ public class DsyyEntranceService {
        return json;
    }
    /**
     * 电子病历调用方式
     *
     * @param pInput
     * @return
     * @throws Exception
     */
    public String service(String pInput)throws Exception{
        ServiceLocator locator = new ServiceLocator();
        String returnStr = locator.getServiceSoap().send(pInput);
        XMLSerializer xmlSerializer = new XMLSerializer();
        String json = xmlSerializer.read(returnStr).toString();
        return json;
    }
   /* public String selectEmrByPatientId(String patientId,String visitId){
        ServiceLocator locator = new ServiceLocator();
        String returnStr = locator.getServiceSoap("http://10.95.8.41:80/csp/jhip/JHIPLIB.SOAP.BS.Service.cls?CfgItem=JH1221查询病历接口BS").send()

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

@@ -1764,21 +1764,25 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
    public JSONObject selectOrderTime(String relationCode){
        WlyyHospitalSysDictDO wlyyHospitalSysDictDO = hospitalSysDictDao.findById("PAY_TIME").orElse(null);
        WlyyHospitalSysDictDO wlyyHospitalSysDictDO = hospitalSysDictDao.findById("PAY_TIME").get();
        BusinessOrderDO businessOrderDO = businessOrderDao.selectByRelationCode(relationCode);
        Date createDate = businessOrderDO.getCreateTime();
        Date createDate;
        Calendar calendar = Calendar.getInstance();
        calendar.setTime(createDate);
        if (businessOrderDO.getOrderCategory().equalsIgnoreCase("4")){
            calendar.add(Calendar.MINUTE,Integer.parseInt(wlyyHospitalSysDictDO.getPyCode()));
        }else {
        if (businessOrderDO!=null){
            createDate = businessOrderDO.getCreateTime();
            calendar.add(Calendar.MINUTE,Integer.parseInt(wlyyHospitalSysDictDO.getDictCode()));
            calendar.setTime(createDate);
        }else {
            calendar.add(Calendar.MINUTE,Integer.parseInt(wlyyHospitalSysDictDO.getPyCode()));
            WlyyPrescriptionDO prescriptionDO = prescriptionDao.findById(relationCode).get();
            calendar.setTime(prescriptionDO.getCreateTime());
            createDate =prescriptionDO.getCreateTime();
        }
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        String time = sdf.format(calendar.getTime());
        JSONObject object = new JSONObject();
        object.put("endTime",time);
        object.put("createTime",businessOrderDO.getCreateTime());
        object.put("createTime",createDate);
        return object;
    }

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

@@ -22,7 +22,7 @@ public class ServiceLocator extends org.apache.axis.client.Service implements Se
    }
    // Use to get a proxy class for ServiceSoap
    private String ServiceSoap_address = "http://10.95.8.41/csp/jhip/JHIPLIB.SOAP.BS.Service.cls";
    private String ServiceSoap_address = "http://10.95.8.41:80/csp/jhip/JHIPLIB.SOAP.BS.Service.cls?CfgItem=JH1221查询病历接口BS";
    public String getServiceSoapAddress() {
        return ServiceSoap_address;