中山医院

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

@@ -3712,6 +3712,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        one.setRegisterDate(outpatientDO.getRegisterDate());
        one.setDept(outpatientDO.getDept());
        one.setDeptName(outpatientDO.getDeptName());
        one.setType(outpatientDO.getType());
        WlyyOutpatientDO outpatient = outpatientDao.save(one);
        WlyyPatientRegisterTimeDO registerTimeDO = null;
@@ -3719,6 +3720,12 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        try {
            //如果是视频预约咨询
            if(StringUtils.isNotBlank(registerJson)){
                //删除预约记录
                List<WlyyPatientRegisterTimeDO> registerTimeDOs = patientRegisterTimeDao.findByOutpatientId(outpatientDO.getId());
                if(registerTimeDOs!=null&&registerTimeDOs.size()>0){
                    patientRegisterTimeDao.delete(registerTimeDOs);
                }
                registerTimeDO = objectMapper.readValue(registerJson,WlyyPatientRegisterTimeDO.class);
                registerTimeDO.setOutpatientId(outpatient.getId());
                registerTimeDO.setCreateTime(new Date());

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

@@ -1316,18 +1316,24 @@ public class EntranceService {
        logger.info("银医通下载: " + re);
        XMLSerializer xmlSerializer = new XMLSerializer();
        JSON json = xmlSerializer.read(re);
        Object errorCode = ((net.sf.json.JSONObject) json).get("error_code");
        if ("ok".equals(errorCode)) {
            JSON json2 = xmlSerializer.read(((net.sf.json.JSONObject) json).get("response").toString());
            System.out.println("银医通下载response:" + json2.toString(1));
            jsonObject.element("code", "1");
            jsonObject.element("obj", json);
        } else {
            Object errorMsg = ((net.sf.json.JSONObject) json).get("error_msg");
            jsonObject.element("code", "-1");
            jsonObject.element("obj", "银医通下载失败，" + errorMsg);
            //{"error_type":"0","error_code":"10002","error_msg":"卡号无效"}
        }
//        Object errorCode = ((net.sf.json.JSONObject) json).get("error_code");
        //由于新建档的居民没有银医通，数据没办法同步。调用接口，暂时不判断返回结果，由诊间支付统一推送消息让居民支付
        JSON json2 = xmlSerializer.read(((net.sf.json.JSONObject) json).get("response").toString());
        System.out.println("银医通下载response:" + json2.toString(1));
        jsonObject.element("code", "1");
        jsonObject.element("obj", json);
//        if ("ok".equals(errorCode)) {
//            JSON json2 = xmlSerializer.read(((net.sf.json.JSONObject) json).get("response").toString());
//            System.out.println("银医通下载response:" + json2.toString(1));
//            jsonObject.element("code", "1");
//            jsonObject.element("obj", json);
//        } else {
//            Object errorMsg = ((net.sf.json.JSONObject) json).get("error_msg");
//            jsonObject.element("code", "-1");
//            jsonObject.element("obj", "银医通下载失败，" + errorMsg);
//            //{"error_type":"0","error_code":"10002","error_msg":"卡号无效"}
//        }
        if (StringUtils.isEmpty(re)) {
            throw new Exception("返回为空！");
        } else {

business/base-service/src/main/java/com/yihu/jw/internet/service/InternetService.java

@@ -736,7 +736,7 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
                jb.put("apply_time", info.get("czrq")==null?"1900-01-01":DateUtil.dateToStrLong((Date)info.get("czrq")));
                jb.put("visit_time", info.get("czrq")==null?"1900-01-01":DateUtil.dateToStrLong((Date)info.get("czrq")));
                jb.put("visit_finish_time", info.get("end_time")==null?"1900-01-01":DateUtil.dateToStrLong((Date)info.get("end_time")));
                jb.put("complaint_content", info.get("symptoms"));
                jb.put("complaint_content", info.get("patientName").toString()+info.get("czrq")==null?"1900-01-01":DateUtil.dateToStrLong((Date)info.get("czrq"))+info.get("symptoms")+"\n");
                jb.put("proc_file", "");
                jb.put("price", 0);
                jb.put("fg_reply", "1");
@@ -862,7 +862,7 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
                jb.put("diag_code",info.get("icd10"));
                jb.put("diag_name", info.get("icd10_name"));
                jb.put("diseases_type", info.get("origin_adm_no") == null ? "1":"2");
                jb.put("complaint_content", info.get("description"));
                jb.put("complaint_content", info.get("paName").toString()+DateUtil.dateToStr(date,"yyyy-MM-dd HH:mm:ss")+info.get("description").toString()+"\n");
                jb.put("proc_file", "");
                jb.put("price",info.get("req_fee")==null?"0":info.get("req_fee").toString());
                jb.put("fg_reply", "");

server/svr-configuration/src/main/resources/application.yml

@@ -16,7 +16,9 @@ eureka:
      enabled: false #启动监控检查，
    serviceUrl: # 默认正式线地址
#      defaultZone: http://jw:jkzl@172.16.1.42:8761/eureka
      defaultZone: http://jw:jkzl@192.0.33.26:8762/eureka
#      defaultZone: http://jw:jkzl@192.0.33.26:8762/eureka
#      defaultZone: http://jw:jkzl@192.168.33.199:8761/eureka
      defaultZone: http://jw:jkzl@172.16.100.63:8761/eureka
  instance:
    #eurika使用IP不使用host
    prefer-ip-address: true

server/svr-configuration/src/main/resources/bootstrap.yml

@@ -51,4 +51,29 @@ spring:
        git:
          uri: ${wlyy.spring.config.git.uri:http://10.95.22.168:3000/Amoy2/wlyy2.0.config.git}
          basedir: /usr/local/wlyy2.0-config
        default-label: ${wlyy.spring.config.git.label:local}
        default-label: ${wlyy.spring.config.git.label:local}
---
spring:
  profiles: jwOracleProd
##git配置
  cloud:
    config:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        git:
          uri: ${wlyy.spring.config.git.uri:http://192.168.33.199:3001/jkzl/wlyy2.0.config.git}
          basedir: /usr/local/wlyy2.0-config
        default-label: ${wlyy.spring.config.git.label:master}
---
## 心脏中心
spring:
  profiles: xzprod
##git配置
  cloud:
    config:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        git:
          uri: ${wlyy.spring.config.git.uri:http://192.168.103.150:3000/jkzl/config.git}
          basedir: /usr/local/wlyy2.0-config
        default-label: ${wlyy.spring.config.git.label:master}

svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/job/DataUploadJob.java

@@ -103,6 +103,17 @@ public class DataUploadJob implements Job {
            }
            logger.info("END==========2.11 电子处方_药品明细表结束 ========" + res);
            logger.info("START========2.12 在线诊疗服务信息-过程图片上传 开始========");
            try {
                res = internetService.upNsOnlineImg(startDate,endDate,null);
            }catch (Exception e){
                e.printStackTrace();
                logger.error(e.toString());
            }
            logger.info("END==========2.12 在线诊疗服务信息-过程图片上传 结束========" + res);
            logger.info("END========DataUploadJob 执行结束========");
        } catch (Exception e) {

svr/svr-internet-hospital/src/main/resources/bootstrap.yml

@@ -58,5 +58,5 @@ spring:
  profiles: jwOracleProd
  cloud:
    config:
      uri: ${wlyy.spring.config.uri:http://172.26.0.107:1221}
      label: ${wlyy.spring.config.label:jwdev}
      uri: ${wlyy.spring.config.uri:http://192.168.33.199:1221}
      label: ${wlyy.spring.config.label:master}