瀏覽代碼

统计服务

wangzhinan 2 年之前
父節點
當前提交
553aaa94a9

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

@ -484,8 +484,10 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        logger.info("findOriginPrescriptionList: registerSn:" + registerSn + " patient" + patient + " patNo:" + patNo + " realOrder:" + realOrder + " admNo:" + admNo);
        List<WlyyPrescriptionVO> prescriptionVOS = entranceService.BS16017(registerSn, realOrder, patNo, admNo, demoFlag);
        for (WlyyPrescriptionVO prescriptionVO:prescriptionVOS){
            WlyyPrescriptionEmrDO wlyyPrescriptionEmrDO = readOutPatientXml(registerSn);//电子病历
            prescriptionVO.setWlyyPrescriptionEmrDO(wlyyPrescriptionEmrDO);
            if (!demoFlag){
                WlyyPrescriptionEmrDO wlyyPrescriptionEmrDO = readOutPatientXml(registerSn);//电子病历
                prescriptionVO.setWlyyPrescriptionEmrDO(wlyyPrescriptionEmrDO);
            }
        }
        return prescriptionVOS;
    }

+ 2 - 2
business/base-service/src/mqConfig/mqdata/BS15018.json

@ -2,7 +2,7 @@
	"code": "1",
		"MsgInfo": [{
		"PAT_NO": "P5616242-0",
		"CARD_NO": "D40136791",
		"CARD_NO": "DD2781527",
		"CARD_STAT": "激活",
		"OP_DATE": "2011-09-27 15:35:57",
		"CARD_TYPE": "2",
@ -12,7 +12,7 @@
		},
	{
		"PAT_NO": "P5616242-0",
		"CARD_NO": "DA1872143",
		"CARD_NO": "DD2781527",
		"CARD_STAT": "激活",
		"OP_DATE": "2014-07-25 08:46:40",
		"CARD_TYPE": "2",

+ 2 - 0
gateway/ag-basic/src/main/resources/application.yml

@ -47,6 +47,8 @@ ribbon:
  SocketTimeout: 600000
  MaxAutoRetries: 3
  MaxAutoRetriesNextServer: 0
  eager-load:
    enabled: true
  eureka:
     enabled: true

+ 3 - 6
gateway/ag-basic/src/main/resources/bootstrap.yml

@ -1,9 +1,9 @@
spring:
  application:
    name: ag-basic--
    name: ag-basic
  cloud:
    config:
      failFast: true
      failFast: false
      username: jw
      password: jkzl
@ -14,7 +14,6 @@ eureka:
      enabled: false #监控检查
    serviceUrl:
      defaultZone: http://jw:jkzl@127.0.0.1:8761/eureka/
    fetch-registry: true
  instance:
    prefer-ip-address: false
    instance-id: ${spring.cloud.client.ip-address}:${server.port}
@ -198,13 +197,11 @@ spring:
---
spring:
  profiles: dsyy
  cloud:
    config:
      uri: ${wlyy.pring.config.uri:http://127.0.0.1:1221}
      label: ${wlyy.spring.config.label:master}
  config:
    activate:
      on-profile: dsyy
---
spring:

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

@ -237,6 +237,8 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
                vos = tnPrescriptionService.findOutpatientList(patient, cardNo, startTime, endTime, demoFlag, ksdm, flag);
            } else if (wxId.equalsIgnoreCase("xm_hcyy_wx")) {
                vos = hcyyPrescriptionService.selectOutpatientList(patient,startTime,endTime,cardNo);
            } else if (wxId.equalsIgnoreCase("xm_tasy_wx")) {
                vos = prescriptionService.findOutpatientList(patient, startTime, endTime, demoFlag, ksdm, cardNo);
            } else {
                return ListEnvelop.getError("尚未开发!");
            }
@ -262,6 +264,8 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
                obj = tnPrescriptionService.findOutpatientInfo(patient, conNo, demoFlag, null);
            } else if (wxId.equalsIgnoreCase("xm_hcyy_wx")) {
                obj = hcyyPrescriptionService.selectOutpatientInfo(patient,conNo);
            } else  if (wxId.equalsIgnoreCase("xm_tasy_wx")) {
                obj = prescriptionService.findOutpatientInfo(patient, conNo);
            } else {
                return ObjEnvelop.getError("尚未开发!");
            }
@ -291,7 +295,9 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
                obj = tnPrescriptionService.findOriginPrescriptionList(registerSn, patNo, realOrder, admNo, demoFlag);
            } else if (wxId.equalsIgnoreCase("xm_hcyy_wx")) {
                obj = hcyyPrescriptionService.selectOriginPrescriptionListLocal(registerSn,patNo,admNo,realOrder);
            } else {
            } else if (wxId.equalsIgnoreCase("xm_tasy_wx")) {
                obj = prescriptionService.findOriginPrescriptionList(registerSn, patNo, realOrder, admNo, demoFlag);
            }else {
                return ListEnvelop.getError("尚未开发!");
            }
@ -640,7 +646,9 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
            return success(tnPrescriptionService.getICD10(pyKey, false));
        } else if (wxId.equalsIgnoreCase("xm_hcyy_wx")) {
            return success(hcyyPrescriptionService.selectIcd10Dict(pyKey));
        } else {
        } if (wxId.equalsIgnoreCase("xm_tasy_wx")) {
            return success(prescriptionService.getICD10(pyKey));
        }else {
            return ListEnvelop.getError("尚未开发!");
        }
@ -672,7 +680,9 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
        } else if (wxId.equalsIgnoreCase("xm_hcyy_wx")) {
            logger.info("pyKey"+pyKey);
            return success(hcyyPrescriptionService.selectDrugDict(pyKey,drugNo));
        } else {
        } else if (wxId.equalsIgnoreCase("xm_tasy_wx")) {
            return success(prescriptionService.getDrugDictionary(drugNo, pyKey, winNo, groupNo));
        }  else {
            return ListEnvelop.getError("尚未开发!");
        }
    }
@ -692,7 +702,9 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
            return success(tnPrescriptionService.getDrugUse(pyKey, demoFlag));
        } else if (wxId.equalsIgnoreCase("xm_hcyy_wx")) {
            return success(hcyyPrescriptionService.selectMedicineUsed(pyKey));
        } else {
        } else if (wxId.equalsIgnoreCase("xm_tasy_wx")) {
            return success(prescriptionService.getDrugUse(drugNo, pyKey));
        }else {
            return ListEnvelop.getError("尚未开发!");
        }
@ -710,7 +722,9 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
            return success(tnPrescriptionService.getDrugFrequency(demoFlag));
        } else if (wxId.equalsIgnoreCase("xm_hcyy_wx")) {
            return success(hcyyPrescriptionService.selectFrequencyDict());
        } else {
        } else if (wxId.equalsIgnoreCase("xm_tasy_wx")) {
            return success(prescriptionService.getDrugFrequency());
        }else {
            return ListEnvelop.getError("尚未开发!");
        }
    }

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

@ -985,7 +985,7 @@ fastDFS:
fast-dfs:
  tracker-server: 172.26.0.110:22122 #服务器地址
wechat:
  id: xm_ykyy_wx  # base库中,wx_wechat 的id字段
  id: xm_hcyy_wx  # base库中,wx_wechat 的id字段
  flag: false #演示环境  true走Mysql数据库  false走Oracle
  url: http://172.16.100.37:8090/hospitalPortal-sms/sms/sendMessage
sms:

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

@ -1,6 +1,6 @@
spring:
  application:
    name:  svr-internet-hospital111
    name:  svr-internet-hospital
  cloud:
    config:
      failFast: true