yeshijie hace 7 años
padre
commit
775aedefbd
Se han modificado 14 ficheros con 260 adiciones y 101 borrados
  1. 16 14
      patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/controller/PrenatalInspectorController.java
  2. 2 2
      patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/dao/HttpLogDao.java
  3. 11 0
      patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/dao/log/HttpLogDetailDao.java
  4. 2 2
      patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/dao/ZyPushLogDao.java
  5. 11 0
      patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/dao/log/ZyPushLogDetailDao.java
  6. 1 1
      patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/entity/HttpLog.java
  7. 52 0
      patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/entity/log/HttpLogDetail.java
  8. 2 2
      patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/entity/ZyPushLog.java
  9. 61 0
      patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/entity/log/ZyPushLogDetail.java
  10. 47 13
      patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/service/LogService.java
  11. 0 8
      patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/service/OpenCountService.java
  12. 21 9
      patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/service/ZysoftBaseService.java
  13. 18 16
      patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/service/ZysoftMaternalService.java
  14. 16 34
      patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/service/prescription/PrescriptionService.java

+ 16 - 14
patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/controller/PrenatalInspectorController.java

@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
 * Created by yeshijie on 2017/9/22.
 */
@RestController
@RequestMapping(value = "/third/prescription/")
@RequestMapping(value = "/third/prenatalInspector/")
@Api(description = "产检接口")
public class PrenatalInspectorController extends BaseController{
@ -25,10 +25,10 @@ public class PrenatalInspectorController extends BaseController{
    @RequestMapping(value = "getEhrMaternalFirstExamRecord",method = RequestMethod.POST)
    @ApiOperation("获取孕妇建卡信息")
    public Result getEhrMaternalFirstExamRecord(@ApiParam(name="idcard",value="身份证号",defaultValue = "352124761015122")
    public Result getEhrMaternalFirstExamRecord(@ApiParam(name="idcard",value="身份证号",defaultValue = "352124761015122,350204197512284026,222406198209202228")
                                                @RequestParam(value = "idcard",required = true) String idcard,
                                                @ApiParam(name="hospital",value="医院code",defaultValue = "3502030500")
                                                @RequestParam(value = "hospital",required = true) String hospital) throws Exception
                                                @RequestParam(value = "hospital",required = false) String hospital) throws Exception
    {
        try {
@ -46,10 +46,12 @@ public class PrenatalInspectorController extends BaseController{
    public Result getEhrMaternalReExamRecord(@ApiParam(name="idcard",value="身份证号",defaultValue = "352124761015122")
                                             @RequestParam(value = "idcard",required = true) String idcard,
                                             @ApiParam(name="hospital",value="医院code",defaultValue = "3502030500")
                                             @RequestParam(value = "hospital",required = true) String hospital) throws Exception{
                                             @RequestParam(value = "hospital",required = false) String hospital,
                                             @ApiParam(name="pregnancyNo",value="产检号")
                                             @RequestParam(value = "pregnancyNo",required = true) String pregnancyNo) throws Exception{
        try {
            String re = maternalService.getEhrMaternalReExamRecord(idcard,hospital);
            String re = maternalService.getEhrMaternalReExamRecord(idcard,hospital,pregnancyNo);
            return Result.success("获取非第一次产检记录成功!",re);
        } catch (Exception ex) {
@ -60,10 +62,10 @@ public class PrenatalInspectorController extends BaseController{
    @RequestMapping(value = "getEhrMaternalBedPrecontractRecord",method = RequestMethod.POST)
    @ApiOperation("获取产床预约信息")
    public Result getEhrMaternalBedPrecontractRecord(@ApiParam(name="idcard",value="身份证号",defaultValue = "352124761015122")
    public Result getEhrMaternalBedPrecontractRecord(@ApiParam(name="idcard",value="身份证号",defaultValue = "35062719831211252X")
                                                     @RequestParam(value = "idcard",required = true) String idcard,
                                                     @ApiParam(name="hospital",value="医院code",defaultValue = "3502030500")
                                                     @RequestParam(value = "hospital",required = true) String hospital) throws Exception{
                                                     @RequestParam(value = "hospital",required = false) String hospital) throws Exception{
        try {
            String re = maternalService.getEhrMaternalBedPrecontractRecord(idcard,hospital);
@ -80,7 +82,7 @@ public class PrenatalInspectorController extends BaseController{
    public Result getEhrMaternalPregnancyHighRecord(@ApiParam(name="idcard",value="身份证号",defaultValue = "352124761015122")
                                                        @RequestParam(value = "idcard",required = true) String idcard,
                                                    @ApiParam(name="hospital",value="医院code",defaultValue = "3502030500")
                                                        @RequestParam(value = "hospital",required = true) String hospital) throws Exception{
                                                        @RequestParam(value = "hospital",required = false) String hospital) throws Exception{
        try {
            String re = maternalService.getEhrMaternalPregnancyHighRecord(idcard,hospital);
@ -97,7 +99,7 @@ public class PrenatalInspectorController extends BaseController{
    public Result getEhrMaternalDeliveryRecord(@ApiParam(name="idcard",value="身份证号",defaultValue = "352124761015122")
                                                   @RequestParam(value = "idcard",required = true) String idcard,
                                               @ApiParam(name="hospital",value="医院code",defaultValue = "3502030500")
                                                   @RequestParam(value = "hospital",required = true) String hospital) throws Exception{
                                                   @RequestParam(value = "hospital",required = false) String hospital) throws Exception{
        try {
            String re = maternalService.getEhrMaternalDeliveryRecord(idcard,hospital);
@ -114,7 +116,7 @@ public class PrenatalInspectorController extends BaseController{
    public Result getEhrMaternalDeliveryChildRecord(@ApiParam(name="idcard",value="身份证号",defaultValue = "352124761015122")
                                                        @RequestParam(value = "idcard",required = true) String idcard,
                                                    @ApiParam(name="hospital",value="医院code",defaultValue = "3502030500")
                                                        @RequestParam(value = "hospital",required = true) String hospital) throws Exception{
                                                        @RequestParam(value = "hospital",required = false) String hospital) throws Exception{
        try {
            String re = maternalService.getEhrMaternalDeliveryChildRecord(idcard,hospital);
@ -131,7 +133,7 @@ public class PrenatalInspectorController extends BaseController{
    public Result getEhrMaternalChildMedicalRecord(@ApiParam(name="idcard",value="身份证号",defaultValue = "352124761015122")
                                                       @RequestParam(value = "idcard",required = true) String idcard,
                                                   @ApiParam(name="hospital",value="医院code",defaultValue = "3502030500")
                                                       @RequestParam(value = "hospital",required = true) String hospital) throws Exception{
                                                       @RequestParam(value = "hospital",required = false) String hospital) throws Exception{
        try {
            String re = maternalService.getEhrMaternalChildMedicalRecord(idcard,hospital);
@ -148,7 +150,7 @@ public class PrenatalInspectorController extends BaseController{
    public Result getEhrMaternalHomeVisitRecord(@ApiParam(name="idcard",value="身份证号",defaultValue = "352124761015122")
                                                    @RequestParam(value = "idcard",required = true) String idcard,
                                                @ApiParam(name="hospital",value="医院code",defaultValue = "3502030500")
                                                    @RequestParam(value = "hospital",required = true) String hospital) throws Exception{
                                                    @RequestParam(value = "hospital",required = false) String hospital) throws Exception{
        try {
            String re = maternalService.getEhrMaternalHomeVisitRecord(idcard,hospital);
@ -165,7 +167,7 @@ public class PrenatalInspectorController extends BaseController{
    public Result getEhrMaternalChildImmuneRecord(@ApiParam(name="idcard",value="身份证号",defaultValue = "352124761015122")
                                                      @RequestParam(value = "idcard",required = true) String idcard,
                                                  @ApiParam(name="hospital",value="医院code",defaultValue = "3502030500")
                                                      @RequestParam(value = "hospital",required = true) String hospital) throws Exception{
                                                      @RequestParam(value = "hospital",required = false) String hospital) throws Exception{
        try {
            String re = maternalService.getEhrMaternalChildImmuneRecord(idcard,hospital);
@ -182,7 +184,7 @@ public class PrenatalInspectorController extends BaseController{
    public Result getEhrMaternalPreFirstExamRecord(@ApiParam(name="idcard",value="身份证号",defaultValue = "352124761015122")
                                                       @RequestParam(value = "idcard",required = true) String idcard,
                                                   @ApiParam(name="hospital",value="医院code",defaultValue = "3502030500")
                                                       @RequestParam(value = "hospital",required = true) String hospital) throws Exception{
                                                       @RequestParam(value = "hospital",required = false) String hospital) throws Exception{
        try {
            String re = maternalService.getEhrMaternalPreFirstExamRecord(idcard,hospital);

+ 2 - 2
patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/dao/HttpLogDao.java

@ -3,9 +3,9 @@
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 *******************************************************************************/
package com.yihu.wlyy.service.dao;
package com.yihu.wlyy.service.dao.log;
import com.yihu.wlyy.service.entity.HttpLog;
import com.yihu.wlyy.service.entity.log.HttpLog;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;

+ 11 - 0
patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/dao/log/HttpLogDetailDao.java

@ -0,0 +1,11 @@
package com.yihu.wlyy.service.dao.log;
import com.yihu.wlyy.service.entity.log.HttpLogDetail;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by yeshijie on 2017/9/26.
 */
public interface HttpLogDetailDao extends PagingAndSortingRepository<HttpLogDetail, Long>, JpaSpecificationExecutor<HttpLogDetail> {
}

+ 2 - 2
patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/dao/ZyPushLogDao.java

@ -1,6 +1,6 @@
package com.yihu.wlyy.service.dao;
package com.yihu.wlyy.service.dao.log;
import com.yihu.wlyy.service.entity.ZyPushLog;
import com.yihu.wlyy.service.entity.log.ZyPushLog;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;

+ 11 - 0
patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/dao/log/ZyPushLogDetailDao.java

@ -0,0 +1,11 @@
package com.yihu.wlyy.service.dao.log;
import com.yihu.wlyy.service.entity.log.ZyPushLogDetail;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by yeshijie on 2017/9/26.
 */
public interface ZyPushLogDetailDao extends PagingAndSortingRepository<ZyPushLogDetail, Long>, JpaSpecificationExecutor<ZyPushLogDetail> {
}

+ 1 - 1
patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/entity/HttpLog.java

@ -1,4 +1,4 @@
package com.yihu.wlyy.service.entity;
package com.yihu.wlyy.service.entity.log;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.wlyy.service.common.model.IdEntity;

+ 52 - 0
patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/entity/log/HttpLogDetail.java

@ -0,0 +1,52 @@
package com.yihu.wlyy.service.entity.log;
import com.yihu.wlyy.service.common.model.IdEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
 * Created by yeshijie on 2017/9/26.
 */
@Entity
@Table(name = "wlyy_http_log_detail")
public class HttpLogDetail extends IdEntity {
    private Long code;//关联code和ZyPushLog表的id
    private String response;//'返回结果',
    private String error;//'报错信息',
    private Date createTime;// '创建时间',
    public Long getCode() {
        return code;
    }
    public void setCode(Long code) {
        this.code = code;
    }
    public String getResponse() {
        return response;
    }
    public void setResponse(String response) {
        this.response = response;
    }
    public String getError() {
        return error;
    }
    public void setError(String error) {
        this.error = error;
    }
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
}

+ 2 - 2
patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/entity/ZyPushLog.java

@ -1,4 +1,4 @@
package com.yihu.wlyy.service.entity;
package com.yihu.wlyy.service.entity.log;
import com.yihu.wlyy.service.common.model.IdEntity;
@ -14,7 +14,7 @@ import java.util.Date;
@Table(name = "wlyy_zy_push_log")
public class ZyPushLog extends IdEntity {
    private String type;//'接口类型 1(推送续方),2续方请求',
    private String type;//'接口类型 1(推送续方),2续方请求 3妇幼保健',
    private String content;//'业务内容',
    private String api;//'调用接口',
    private String method;//'调用方式',

+ 61 - 0
patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/entity/log/ZyPushLogDetail.java

@ -0,0 +1,61 @@
package com.yihu.wlyy.service.entity.log;
import com.yihu.wlyy.service.common.model.IdEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
 * Created by yeshijie on 2017/9/26.
 */
@Entity
@Table(name = "wlyy_zy_push_log_detail")
public class ZyPushLogDetail extends IdEntity {
    private Long code;//关联code和ZyPushLog表的code一致
    private String response;//'返回结果',
    private String request;//'请求数据',
    private String error;//'报错信息',
    private Date createTime;// '创建时间',
    public Long getCode() {
        return code;
    }
    public void setCode(Long code) {
        this.code = code;
    }
    public String getResponse() {
        return response;
    }
    public void setResponse(String response) {
        this.response = response;
    }
    public String getRequest() {
        return request;
    }
    public void setRequest(String request) {
        this.request = request;
    }
    public String getError() {
        return error;
    }
    public void setError(String error) {
        this.error = error;
    }
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
}

+ 47 - 13
patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/service/LogService.java

@ -2,15 +2,20 @@ package com.yihu.wlyy.service.service;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.yihu.wlyy.service.dao.HttpLogDao;
import com.yihu.wlyy.service.dao.ZyPushLogDao;
import com.yihu.wlyy.service.entity.HttpLog;
import com.yihu.wlyy.service.entity.ZyPushLog;
import com.yihu.wlyy.service.dao.log.HttpLogDao;
import com.yihu.wlyy.service.dao.log.HttpLogDetailDao;
import com.yihu.wlyy.service.dao.log.ZyPushLogDao;
import com.yihu.wlyy.service.dao.log.ZyPushLogDetailDao;
import com.yihu.wlyy.service.entity.log.HttpLog;
import com.yihu.wlyy.service.entity.log.HttpLogDetail;
import com.yihu.wlyy.service.entity.log.ZyPushLog;
import com.yihu.wlyy.service.entity.log.ZyPushLogDetail;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.UUID;
/**
 * Created by hzp on 2016/9/24.
@ -25,6 +30,10 @@ public class LogService {
    private HttpLogDao httpLogDao;
    @Autowired
    private ZyPushLogDao zyPushLogDao;
    @Autowired
    private HttpLogDetailDao httpLogDetailDao;
    @Autowired
    private ZyPushLogDetailDao zyPushLogDetailDao;
    @Autowired
    private SystemDictService systemDictService;
@ -33,6 +42,10 @@ public class LogService {
    public String onePayType = "3";
    public String caType = "4";
    public String getCode() {
        return UUID.randomUUID().toString().replaceAll("-", "");
    }
    /**
     * 新增开放api调用日志
     **/
@ -47,10 +60,18 @@ public class LogService {
            log.setParams(params);
            log.setCreateTime(new Date());
            log.setCreateTime(new Date());
            log.setResponse(response);
            log.setError(error);
//            log.setResponse(response);
//            log.setError(error);
            log.setStatus(isSuccess?"1":"0");
            httpLogDao.save(log);
            //明细表
            HttpLogDetail detail = new HttpLogDetail();
            detail.setCode(log.getId());
            detail.setCreateTime(new Date());
            detail.setResponse(response);
            detail.setError(error);
            httpLogDetailDao.save(detail);
        }
        catch (Exception ex)
        {
@ -67,18 +88,31 @@ public class LogService {
            log.setCreateTime(new Date());
            log.setApi(api);
            log.setContent(content);
            log.setError(error);
//            log.setError(error);
            log.setMethod(method);
            log.setRequest(request);
            if(re.length()>10652261){
                log.setResponse("超过longtext限制");
            }else {
                log.setResponse(JSONObject.toJSONString(re, SerializerFeature.WriteMapNullValue));
            }
//            log.setRequest(request);
//            if(re.length()>10652261){
//                log.setResponse("超过longtext限制");
//            }else {
//                log.setResponse(JSONObject.toJSONString(re, SerializerFeature.WriteMapNullValue));
//            }
            log.setRetryTimes(0);
            log.setStatus(status);
            log.setType(type);
            zyPushLogDao.save(log);
            //明细表
            ZyPushLogDetail detail = new ZyPushLogDetail();
            detail.setCode(log.getId());
            detail.setError(error);
            detail.setCreateTime(new Date());
            if(re.length()>10652261){
                detail.setResponse("超过longtext限制");
            }else {
                detail.setResponse(JSONObject.toJSONString(re, SerializerFeature.WriteMapNullValue));
            }
            detail.setRequest(request);
            zyPushLogDetailDao.save(detail);
        }catch (Exception e){
            e.printStackTrace();
            logger.info("保存数据日志出错");

+ 0 - 8
patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/service/OpenCountService.java

@ -2,22 +2,14 @@ package com.yihu.wlyy.service.service;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.sun.prism.impl.paint.PaintUtil;
import com.yihu.wlyy.service.common.util.StringUtil;
import com.yihu.wlyy.service.dao.HospitalMappingDao;
import com.yihu.wlyy.service.dao.HttpLogDao;
import com.yihu.wlyy.service.dao.QuotaResultDao;
import com.yihu.wlyy.service.dao.SignFamilyLogDao;
import com.yihu.wlyy.service.entity.HospitalMapping;
import com.yihu.wlyy.service.entity.HttpLog;
import com.yihu.wlyy.service.entity.QuotaResult;
import com.yihu.wlyy.service.entity.SignFamilyLog;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
/**

+ 21 - 9
patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/service/ZysoftBaseService.java

@ -8,9 +8,11 @@ import com.yihu.wlyy.service.common.http.HttpApiException;
import com.yihu.wlyy.service.common.model.Result;
import com.yihu.wlyy.service.common.util.StringUtil;
import com.yihu.wlyy.service.dao.HospitalMappingDao;
import com.yihu.wlyy.service.dao.ZyPushLogDao;
import com.yihu.wlyy.service.dao.log.ZyPushLogDao;
import com.yihu.wlyy.service.dao.log.ZyPushLogDetailDao;
import com.yihu.wlyy.service.entity.HospitalMapping;
import com.yihu.wlyy.service.entity.ZyPushLog;
import com.yihu.wlyy.service.entity.log.ZyPushLog;
import com.yihu.wlyy.service.entity.log.ZyPushLogDetail;
import com.zoe.phip.ssp.sdk.ApiException;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@ -39,7 +41,8 @@ public class ZysoftBaseService {
    private HospitalMappingDao hospitalMappingDao;
    @Autowired
    private ZyPushLogDao zyPushLogDao;
    @Autowired
    private ZyPushLogDetailDao zyPushLogDetailDao;
    //默认重复次数
    private int retryTimes = 3;
@ -73,15 +76,24 @@ public class ZysoftBaseService {
        log.setCreateTime(new Date());
        log.setApi(api);
        log.setContent(content);
        log.setError(error);
//        log.setError(error);
        log.setMethod(method);
        log.setRequest(request);
        log.setResponse(JSONObject.toJSONString(re,SerializerFeature.WriteMapNullValue));
//        log.setRequest(request);
//        log.setResponse(JSONObject.toJSONString(re,SerializerFeature.WriteMapNullValue));
        log.setRetryTimes(0);
        log.setStatus(status);
        log.setType(type);
        zyPushLogDao.save(log);
        //明细表
        ZyPushLogDetail detail = new ZyPushLogDetail();
        detail.setCode(log.getId());
        detail.setError(error);
        detail.setCreateTime(new Date());
        detail.setResponse(JSONObject.toJSONString(re,SerializerFeature.WriteMapNullValue));
        detail.setRequest(request);
        zyPushLogDetailDao.save(detail);
        return re;
    }
@ -186,7 +198,7 @@ public class ZysoftBaseService {
    /**
     * 基卫二次封装Post接口
     */
    public String postSecond(String api,String content, Map<String,String> params,JSONObject jsonParams, Map<String,String> headers,boolean needRetry,Integer apiType) throws Exception
    public String postSecond(String api,String content, Map<String,String> params,JSONObject jsonParams, Map<String,String> headers,boolean needRetry,Integer apiType,String type) throws Exception
    {
        String re = "";
        headers.put("INTERFACE",api);
@ -232,7 +244,7 @@ public class ZysoftBaseService {
//            com.alibaba.fastjson.JSONObject j = com.alibaba.fastjson.JSONObject.parseObject(re);
            //保存http日志
//            logService.saveHttpLog(isSuccess,api,content,method,msgHeader,msgBody,re,error);
            logService.saveZyPushLog(api,content,null,"POST",msgHeader+","+msgBody,re,"1","2");
            logService.saveZyPushLog(api,content,null,"POST",msgHeader+","+msgBody,re,"1",type);
        }
        catch (Exception ex)
        {
@ -243,7 +255,7 @@ public class ZysoftBaseService {
            //保存http日志
//            logService.saveHttpLog(isSuccess,api,content,method,msgHeader,msgBody,re,error);
            logService.saveZyPushLog(api,content,error,"POST",msgHeader+","+msgBody,re,"0","2");
            logService.saveZyPushLog(api,content,error,"POST",msgHeader+","+msgBody,re,"0",type);
            if(ex instanceof ApiException)
            {

+ 18 - 16
patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/service/ZysoftMaternalService.java

@ -31,7 +31,7 @@ public class ZysoftMaternalService extends ZysoftBaseService{
        params.put("ORG_CODE",hospital);
        params.put("IDENTITY_CARD_NO",idcard);
        String response = postSecond("getEhrMaternalFirstExamRecord","获取孕妇建卡信息",params,null,header,false,1);
        String response = postSecond("getEhrMaternalFirstExamRecord","获取孕妇建卡信息",params,null,header,false,1,"3");
        return response;
    }
@ -40,10 +40,11 @@ public class ZysoftMaternalService extends ZysoftBaseService{
     * 7.33 获取非第一次产检记录
     * @param idcard
     * @param hospitalCode
     * @param pregnancyNo 产检号
     * @return
     * @throws Exception
     */
    public String getEhrMaternalReExamRecord(String idcard,String hospitalCode) throws Exception{
    public String getEhrMaternalReExamRecord(String idcard,String hospitalCode,String pregnancyNo) throws Exception{
        String[] hospitalMapping = getHospitalMapping(hospitalCode); //获取机构映射
        String hospital = hospitalMapping[0];
@ -56,8 +57,9 @@ public class ZysoftMaternalService extends ZysoftBaseService{
        Map<String,String> params = new HashMap<>();
        params.put("ORG_CODE",hospital);
        params.put("IDENTITY_CARD_NO",idcard);
        params.put("PREGNANCY_NO",pregnancyNo);
        String response = postSecond("getEhrMaternalReExamRecord","获取非第一次产检记录",params,null,header,false,1);
        String response = postSecond("getEhrMaternalReExamRecord","获取非第一次产检记录",params,null,header,false,1,"3");
        return response;
    }
@ -82,7 +84,7 @@ public class ZysoftMaternalService extends ZysoftBaseService{
        params.put("ORG_CODE",hospital);
        params.put("IDENTITY_CARD_NO",idcard);
        String response = postSecond("getEhrMaternalBedPrecontractRecord","获取产床预约信息",params,null,header,false,1);
        String response = postSecond("getEhrMaternalBedPrecontractRecord","获取产床预约信息",params,null,header,false,1,"3");
        return response;
    }
@ -107,7 +109,7 @@ public class ZysoftMaternalService extends ZysoftBaseService{
        params.put("ORG_CODE",hospital);
        params.put("IDENTITY_CARD_NO",idcard);
        String response = postSecond("getEhrMaternalPregnancyHighRecord","获取高危产妇信息",params,null,header,false,1);
        String response = postSecond("getEhrMaternalPregnancyHighRecord","获取高危产妇信息",params,null,header,false,1,"3");
        return response;
    }
@ -132,7 +134,7 @@ public class ZysoftMaternalService extends ZysoftBaseService{
        params.put("ORG_CODE",hospital);
        params.put("IDENTITY_CARD_NO",idcard);
        String response = postSecond("getEhrMaternalDeliveryRecord","获取孕妇分娩信息",params,null,header,false,1);
        String response = postSecond("getEhrMaternalDeliveryRecord","获取孕妇分娩信息",params,null,header,false,1,"3");
        return response;
    }
@ -157,7 +159,7 @@ public class ZysoftMaternalService extends ZysoftBaseService{
        params.put("ORG_CODE",hospital);
        params.put("IDENTITY_CARD_NO",idcard);
        String response = postSecond("getEhrMaternalDeliveryChildRecord","获取新生儿基本信息",params,null,header,false,1);
        String response = postSecond("getEhrMaternalDeliveryChildRecord","获取新生儿基本信息",params,null,header,false,1,"3");
        return response;
    }
@ -182,7 +184,7 @@ public class ZysoftMaternalService extends ZysoftBaseService{
        params.put("ORG_CODE",hospital);
        params.put("IDENTITY_CARD_NO",idcard);
        String response = postSecond("getEhrMaternalChildMedicalRecord","获取儿童健康体检0-6岁记录",params,null,header,false,1);
        String response = postSecond("getEhrMaternalChildMedicalRecord","获取儿童健康体检0-6岁记录",params,null,header,false,1,"3");
        return response;
    }
@ -207,7 +209,7 @@ public class ZysoftMaternalService extends ZysoftBaseService{
        params.put("ORG_CODE",hospital);
        params.put("IDENTITY_CARD_NO",idcard);
        String response = postSecond("getEhrMaternalHomeVisitRecord","获取新生儿访视信息",params,null,header,false,1);
        String response = postSecond("getEhrMaternalHomeVisitRecord","获取新生儿访视信息",params,null,header,false,1,"3");
        return response;
    }
@ -232,7 +234,7 @@ public class ZysoftMaternalService extends ZysoftBaseService{
        params.put("ORG_CODE",hospital);
        params.put("IDENTITY_CARD_NO",idcard);
        String response = postSecond("getEhrMaternalChildImmuneRecord","获取新生儿免疫记录",params,null,header,false,1);
        String response = postSecond("getEhrMaternalChildImmuneRecord","获取新生儿免疫记录",params,null,header,false,1,"3");
        return response;
    }
@ -256,7 +258,7 @@ public class ZysoftMaternalService extends ZysoftBaseService{
        params.put("ORG_CODE",hospital);
        params.put("IDENTITY_CARD_NO",idcard);
        String response = postSecond("getEhrMaternalPreFirstExamRecord","获取孕妇预建卡信息",params,null,header,false,1);
        String response = postSecond("getEhrMaternalPreFirstExamRecord","获取孕妇预建卡信息",params,null,header,false,1,"3");
        return response;
    }
@ -280,7 +282,7 @@ public class ZysoftMaternalService extends ZysoftBaseService{
        params.put("ORG_CODE",hospital);
        String response = postSecond("SaveEhrMaternalPreFirstExamRecord","上传孕妇预建卡信息",params,null,header,false,1);
        String response = postSecond("SaveEhrMaternalPreFirstExamRecord","上传孕妇预建卡信息",params,null,header,false,1,"3");
        return response;
    }
@ -304,7 +306,7 @@ public class ZysoftMaternalService extends ZysoftBaseService{
        params.put("ORG_CODE",hospital);
        params.put("IDENTITY_CARD_NO",idcard);
        String response = postSecond("SaveEhrMaternalHomeVisitRecord","上传新生儿访视信息",params,null,header,false,1);
        String response = postSecond("SaveEhrMaternalHomeVisitRecord","上传新生儿访视信息",params,null,header,false,1,"3");
        return response;
    }
@ -331,7 +333,7 @@ public class ZysoftMaternalService extends ZysoftBaseService{
        params.put("PUERPERA_ID_NUMBER",idcard);
        params.put("TPP_RECORD_DATE_TIME",searchTime);//身份证和查询时间必填一个,区间为一天
        String response = postSecond("getEhrMaternalZSPreDeliveryRecord","获取待产记录",params,null,header,false,1);
        String response = postSecond("getEhrMaternalZSPreDeliveryRecord","获取待产记录",params,null,header,false,1,"3");
        return response;
    }
@ -358,7 +360,7 @@ public class ZysoftMaternalService extends ZysoftBaseService{
        params.put("PUERPERA_ID_NUMBER",idcard);
        params.put("CREATE_TIME",searchTime);
        String response = postSecond("getEhrMaternalZSDeliveryRecord","获取阴道分娩记录",params,null,header,false,1);
        String response = postSecond("getEhrMaternalZSDeliveryRecord","获取阴道分娩记录",params,null,header,false,1,"3");
        return response;
    }
@ -384,7 +386,7 @@ public class ZysoftMaternalService extends ZysoftBaseService{
        params.put("PUERPERA_ID_NUMBER",idcard);//身份证和查询时间必填一个
        params.put("CREATE_TIME",searchTime);
        String response = postSecond("getEhrMaternalZSCaesareanBirthRecord","获取剖宫产记录",params,null,header,false,1);
        String response = postSecond("getEhrMaternalZSCaesareanBirthRecord","获取剖宫产记录",params,null,header,false,1,"3");
        return response;
    }

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 16 - 34
patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/service/prescription/PrescriptionService.java