LAPTOP-KB9HII50\70708 преди 2 години
родител
ревизия
f30f0d45ef
променени са 16 файла, в които са добавени 350 реда и са изтрити 54 реда
  1. 1 1
      business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/DrugsPlanService.java
  2. 0 11
      business/base-service/src/main/java/com/yihu/jw/processGuidance/dao/BasePatientProcessGuidanceDao.java
  3. 5 0
      business/base-service/src/main/java/com/yihu/jw/processGuidance/dao/BasePatientProcessGuidanceLogDao.java
  4. 11 0
      business/base-service/src/main/java/com/yihu/jw/processGuidance/dao/BaseProcessGuidanceBookingDao.java
  5. 4 0
      business/base-service/src/main/java/com/yihu/jw/processGuidance/dao/BaseProcessGuidanceNodeAppDao.java
  6. 5 0
      business/base-service/src/main/java/com/yihu/jw/processGuidance/dao/BaseProcessGuidancePresetDao.java
  7. 14 0
      business/base-service/src/main/java/com/yihu/jw/processGuidance/dao/BaseProcessGuidanceThirdPushLogDao.java
  8. 124 17
      business/base-service/src/main/java/com/yihu/jw/processGuidance/service/ProcessGuidanceService.java
  9. 30 8
      common/common-entity/src/main/java/com/yihu/jw/entity/base/processGuidance/BasePatientProcessGuidanceLogDO.java
  10. 12 2
      common/common-entity/src/main/java/com/yihu/jw/entity/base/processGuidance/BasePatientProcessGuidanceDO.java
  11. 22 0
      common/common-entity/src/main/java/com/yihu/jw/entity/base/processGuidance/BaseProcessGuidancePresetDO.java
  12. 67 0
      common/common-entity/src/main/java/com/yihu/jw/entity/base/processGuidance/BaseProcessGuidanceThirdPushLogDO.java
  13. 4 2
      svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/config/MvcConfig.java
  14. 17 4
      svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/processGuidance/ProcessGuidanceEndpoint.java
  15. 34 5
      svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/processGuidance/ThirdProcessGuidanceEndpoint.java
  16. 0 4
      svr/svr-internet-hospital/src/main/resources/application.yml

+ 1 - 1
business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/DrugsPlanService.java

@ -54,7 +54,7 @@ public class DrugsPlanService {
    }
    /**
     * 手动生成用药计划
     * 手动生成message
     * @param prescriptionId
     */
    @Transactional(rollbackFor = Exception.class)

+ 0 - 11
business/base-service/src/main/java/com/yihu/jw/processGuidance/dao/BasePatientProcessGuidanceDao.java

@ -1,11 +0,0 @@
package com.yihu.jw.processGuidance.dao;
import com.yihu.jw.entity.base.processGuidance.BasePatientProcessGuidanceDO;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
/**
 * Created by yeshijie on 2022/11/23.
 */
public interface BasePatientProcessGuidanceDao extends JpaRepository<BasePatientProcessGuidanceDO, String>, JpaSpecificationExecutor<BasePatientProcessGuidanceDO> {
}

+ 5 - 0
business/base-service/src/main/java/com/yihu/jw/processGuidance/dao/BasePatientProcessGuidanceLogDao.java

@ -4,9 +4,14 @@ import com.yihu.jw.entity.base.processGuidance.BasePatientProcessGuidanceLogDO;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import java.util.List;
/**
 * Created by yeshijie on 2022/11/23.
 */
public interface BasePatientProcessGuidanceLogDao extends JpaRepository<BasePatientProcessGuidanceLogDO, String>, JpaSpecificationExecutor<BasePatientProcessGuidanceLogDO> {
    List<BasePatientProcessGuidanceLogDO> findByPatientAndTypeAndStatus(String patient,Integer type,Integer status);
    List<BasePatientProcessGuidanceLogDO> findByPatientAndCodeAndType(String patient,String code,Integer type);
}

+ 11 - 0
business/base-service/src/main/java/com/yihu/jw/processGuidance/dao/BaseProcessGuidanceBookingDao.java

@ -0,0 +1,11 @@
package com.yihu.jw.processGuidance.dao;
import com.yihu.jw.entity.base.processGuidance.BaseProcessGuidanceBookingDO;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
/**
 * Created by yeshijie on 2022/11/23.
 */
public interface BaseProcessGuidanceBookingDao extends JpaRepository<BaseProcessGuidanceBookingDO, String>, JpaSpecificationExecutor<BaseProcessGuidanceBookingDO> {
}

+ 4 - 0
business/base-service/src/main/java/com/yihu/jw/processGuidance/dao/BaseProcessGuidanceNodeAppDao.java

@ -3,6 +3,7 @@ package com.yihu.jw.processGuidance.dao;
import com.yihu.jw.entity.base.processGuidance.BaseProcessGuidanceNodeAppDO;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import java.util.List;
@ -14,5 +15,8 @@ public interface BaseProcessGuidanceNodeAppDao extends JpaRepository<BaseProcess
    List<BaseProcessGuidanceNodeAppDO> findByNodeId(String nodeId);
    @Query("select a from BaseProcessGuidanceNodeAppDO a,BaseProcessGuidanceNodeDO b where b.nodeCode=?1 and a.nodeId=b.id")
    List<BaseProcessGuidanceNodeAppDO> findByNodeCode(String nodeCode);
    void deleteByNodeId(String nodeId);
}

+ 5 - 0
business/base-service/src/main/java/com/yihu/jw/processGuidance/dao/BaseProcessGuidancePresetDao.java

@ -3,6 +3,7 @@ package com.yihu.jw.processGuidance.dao;
import com.yihu.jw.entity.base.processGuidance.BaseProcessGuidancePresetDO;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import java.util.List;
@ -12,7 +13,11 @@ import java.util.List;
public interface BaseProcessGuidancePresetDao extends JpaRepository<BaseProcessGuidancePresetDO, String>,
        JpaSpecificationExecutor<BaseProcessGuidancePresetDO> {
    @Query("from BaseProcessGuidancePresetDO where processGuidanceId=?1 order by sortNo asc ")
    List<BaseProcessGuidancePresetDO> findByProcessGuidanceId(String processGuidanceId);
    void deleteByProcessGuidanceId(String processGuidanceId);
    List<BaseProcessGuidancePresetDO> findByProcessCode(String processCode);
}

+ 14 - 0
business/base-service/src/main/java/com/yihu/jw/processGuidance/dao/BaseProcessGuidanceThirdPushLogDao.java

@ -0,0 +1,14 @@
package com.yihu.jw.processGuidance.dao;
import com.yihu.jw.entity.base.processGuidance.BaseProcessGuidanceThirdPushLogDO;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
/**
 * Created by yeshijie on 2022/11/29.
 */
public interface BaseProcessGuidanceThirdPushLogDao extends JpaRepository<BaseProcessGuidanceThirdPushLogDO, String>,
        JpaSpecificationExecutor<BaseProcessGuidanceThirdPushLogDO> {
}

+ 124 - 17
business/base-service/src/main/java/com/yihu/jw/processGuidance/service/ProcessGuidanceService.java

@ -1,55 +1,162 @@
package com.yihu.jw.processGuidance.service;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.base.processGuidance.BasePatientProcessGuidanceDO;
import com.yihu.jw.entity.base.processGuidance.BaseProcessGuidanceDeptDO;
import com.yihu.jw.entity.base.processGuidance.*;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.processGuidance.dao.BasePatientProcessGuidanceDao;
import com.yihu.jw.processGuidance.dao.BasePatientProcessGuidanceLogDao;
import com.yihu.jw.processGuidance.dao.BaseProcessGuidanceDao;
import com.yihu.jw.processGuidance.dao.BaseProcessGuidanceDeptDao;
import com.yihu.jw.processGuidance.dao.*;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
 * Created by yeshijie on 2022/11/18.
 */
@Service
public class ProcessGuidanceService {
    private static final Logger logger = LoggerFactory.getLogger(ProcessGuidanceService.class);
    @Autowired
    private BasePatientDao patientDao;
    @Autowired
    private BasePatientProcessGuidanceDao patientProcessGuidanceDao;
    private BaseProcessGuidanceBookingDao processGuidanceBookingDao;
    @Autowired
    private BasePatientProcessGuidanceLogDao patientProcessGuidanceLogDao;
    @Autowired
    private BaseProcessGuidanceDao processGuidanceDao;
    @Autowired
    private BaseProcessGuidancePresetDao presetDao;
    @Autowired
    private BaseProcessGuidanceDeptDao deptDao;
    @Autowired
    private BaseProcessGuidanceThirdPushLogDao thirdPushLogDao;
    @Autowired
    private BaseProcessGuidanceNodeAppDao nodeAppDao;
    public JSONArray findProcessGuidanceList(String patient,Integer isApp){
        JSONArray jsonArray = new JSONArray();
        List<BasePatientProcessGuidanceLogDO> logDOList = patientProcessGuidanceLogDao.findByPatientAndTypeAndStatus(patient,1,1);
        for (BasePatientProcessGuidanceLogDO logDO:logDOList){
            JSONObject json = new JSONObject();
            json.put("patient",logDO.getPatient());
            json.put("nodeCode",logDO.getNodeCode());
            json.put("code",logDO.getCode());
            json.put("relationId",logDO.getRelationId());
            JSONArray presetArray = new JSONArray();
            List<BaseProcessGuidancePresetDO> presetDOList = presetDao.findByProcessGuidanceId(logDO.getGuidanceId());
            List<BasePatientProcessGuidanceLogDO> logDOS = patientProcessGuidanceLogDao.findByPatientAndCodeAndType(patient,logDO.getCode(),2);
            Map<String,BasePatientProcessGuidanceLogDO> logDOMap = logDOS.stream().collect(Collectors.toMap
                    (BasePatientProcessGuidanceLogDO::getNodeCode,log->log,(oldLog,newLog)->oldLog));
            for (BaseProcessGuidancePresetDO presetDO:presetDOList){
                JSONObject presetJson = new JSONObject();
                String processCode = presetDO.getProcessCode();
                presetJson.put("processCode", processCode);
                presetJson.put("processName", presetDO.getProcessName());
                presetJson.put("sortNo", presetDO.getSortNo());
                presetJson.put("isOptional", presetDO.getIsOptional());
                if(logDOMap.containsKey(processCode)){
                    presetJson.put("status",1);
                    BaseProcessGuidanceBookingDO bookingDO = processGuidanceBookingDao.findById(logDOMap.get(processCode).getRelationId()).orElse(null);
                    presetJson.put("obj", bookingDO);
                }else {
                    presetJson.put("status",0);
                }
                if(isApp==1){
                    List<BaseProcessGuidanceNodeAppDO> appDOS = nodeAppDao.findByNodeCode(processCode);
                    presetJson.put("appDOS", appDOS);
                }
                presetArray.add(presetJson);
            }
            json.put("presetDOList",presetArray);
            jsonArray.add(json);
        }
        return jsonArray;
    }
    /**
     * 医院推送的全流程指引
     * type 全流程流程类型
     */
    public void sendGuidanceInfo(String jsonData,String type){
        BasePatientProcessGuidanceDO patientProcessGuidanceDO = JSONObject.parseObject(jsonData, BasePatientProcessGuidanceDO.class);
        BasePatientDO patientDO = patientDao.findByIdcard(patientProcessGuidanceDO.getIdcard());
    @Async
    public void sendGuidanceInfo(String jsonData){
        BaseProcessGuidanceThirdPushLogDO thirdPushLogDO = JSONObject.parseObject(jsonData, BaseProcessGuidanceThirdPushLogDO.class);
        String api = thirdPushLogDO.getApi();
        String param = thirdPushLogDO.getParam();
        String nodeCode = thirdPushLogDO.getNodeCode();
        if(StringUtils.isNotBlank(param)&&param.length()>22000){
            thirdPushLogDO.setParam(param.substring(0,22000));
        }
        try {
            /**
             * 根据不同的api调用不同的方法
             */
            switch (api){
                case "gotoOrg":
                    gotoOrg(thirdPushLogDO);
                    break;
                default:
                    logger.info("未找到适配接口");
                    break;
            }
        }catch (Exception e){
            e.printStackTrace();
        }
        thirdPushLogDO.setCreateTime(new Date());
        thirdPushLogDao.save(thirdPushLogDO);
    }
    @Transactional(rollbackFor = Exception.class)
    public void gotoOrg(BaseProcessGuidanceThirdPushLogDO thirdPushLogDO){
        BaseProcessGuidanceBookingDO bookingDO = JSONObject.parseObject(thirdPushLogDO.getParam(), BaseProcessGuidanceBookingDO.class);
        BasePatientDO patientDO = patientDao.findByIdcard(bookingDO.getIdcard());
        if(patientDO==null){
            patientProcessGuidanceDO.setPatient(patientDO.getId());
            bookingDO.setPatient(patientDO.getId());
        }
        patientProcessGuidanceDO.setCreateTime(new Date());
        //查找科室对应的流程
        BaseProcessGuidanceDeptDO deptDO = deptDao.findByDeptCode(patientProcessGuidanceDO.getDeptCode());
        if(deptDO!=null){
            patientProcessGuidanceDO.setGuidanceId(deptDO.getProcessGuidanceId());
        bookingDO.setCreateTime(new Date());
        List<BaseProcessGuidancePresetDO> presetDOList = presetDao.findByProcessCode(thirdPushLogDO.getNodeCode());
        if(presetDOList.size()>0){
            BaseProcessGuidancePresetDO presetDO = presetDOList.get(0);
            bookingDO.setGuidanceId(presetDO.getProcessGuidanceId());
            thirdPushLogDO.setGuidanceId(presetDO.getProcessGuidanceId());
        }
        processGuidanceBookingDao.save(bookingDO);
        patientProcessGuidanceDao.save(patientProcessGuidanceDO);
        //新增流程开始日志
        //判断是否唯一的流程标志 暂无
//            String code = UUID.randomUUID().toString().replace("-", "");
        String code = bookingDO.getAdmNo();
        addLog(bookingDO.getPatient(),code, bookingDO.getId(), 1,1,thirdPushLogDO.getNodeCode(),bookingDO.getGuidanceId());
        //新增流程过程日志
        addLog(bookingDO.getPatient(),code, bookingDO.getId(), 2,1,thirdPushLogDO.getNodeCode(),bookingDO.getGuidanceId());
    }
    public void addLog(String patient,String code,String relationId,Integer type,Integer status,String nodeCode,String guidanceId){
        BasePatientProcessGuidanceLogDO logDO = new BasePatientProcessGuidanceLogDO();
        logDO.setCode(code);
        logDO.setPatient(patient);
        logDO.setRelationId(relationId);
        logDO.setType(type);
        logDO.setStatus(status);
        logDO.setGuidanceId(guidanceId);
        logDO.setNodeCode(nodeCode);
        logDO.setCreateTime(new Date());
        patientProcessGuidanceLogDao.save(logDO);
    }
    public void sendGuidance(String patient,String type,String orderId) {

+ 30 - 8
common/common-entity/src/main/java/com/yihu/jw/entity/base/processGuidance/BasePatientProcessGuidanceLogDO.java

@ -15,12 +15,14 @@ import javax.persistence.Table;
public class BasePatientProcessGuidanceLogDO extends UuidIdentityEntityWithCreateTime {
    private String patient;
    private String patientGuidanceId;//关联居民流程表id
    private Integer type;//类型
    private String code;//居民流程编码  一个居民同一个流程编码相同
    private Integer type;//类型 1开始流程记录 2具体流程记录日志
    private Integer status;//状态 0取消 1进行中 2已完成
    private String relationId;//关联id
    private String nodeCode;//节点
    private String guidanceId;//流程id
    @Column(name = "patient")
    public String getPatient() {
        return patient;
    }
@ -29,15 +31,16 @@ public class BasePatientProcessGuidanceLogDO extends UuidIdentityEntityWithCreat
        this.patient = patient;
    }
    @Column(name = "patient_guidance_id")
    public String getPatientGuidanceId() {
        return patientGuidanceId;
    @Column(name = "code")
    public String getCode() {
        return code;
    }
    public void setPatientGuidanceId(String patientGuidanceId) {
        this.patientGuidanceId = patientGuidanceId;
    public void setCode(String code) {
        this.code = code;
    }
    @Column(name = "type")
    public Integer getType() {
        return type;
    }
@ -46,6 +49,7 @@ public class BasePatientProcessGuidanceLogDO extends UuidIdentityEntityWithCreat
        this.type = type;
    }
    @Column(name = "status")
    public Integer getStatus() {
        return status;
    }
@ -62,4 +66,22 @@ public class BasePatientProcessGuidanceLogDO extends UuidIdentityEntityWithCreat
    public void setRelationId(String relationId) {
        this.relationId = relationId;
    }
    @Column(name = "node_code")
    public String getNodeCode() {
        return nodeCode;
    }
    public void setNodeCode(String nodeCode) {
        this.nodeCode = nodeCode;
    }
    @Column(name = "guidance_id")
    public String getGuidanceId() {
        return guidanceId;
    }
    public void setGuidanceId(String guidanceId) {
        this.guidanceId = guidanceId;
    }
}

+ 12 - 2
common/common-entity/src/main/java/com/yihu/jw/entity/base/processGuidance/BasePatientProcessGuidanceDO.java

@ -10,9 +10,10 @@ import javax.persistence.Table;
 * Created by yeshijie on 2022/11/23.
 */
@Entity
@Table(name = "base_patient_process_guidance")
public class BasePatientProcessGuidanceDO extends UuidIdentityEntityWithCreateTime {
@Table(name = "base_process_guidance_booking")
public class BaseProcessGuidanceBookingDO extends UuidIdentityEntityWithCreateTime {
    private String admNo;//就诊编号
    private String guidanceId;//预设流程id
    private String patient;//
    private String name;//就诊人姓名
@ -24,6 +25,15 @@ public class BasePatientProcessGuidanceDO extends UuidIdentityEntityWithCreateTi
    private String deptName;//科室名称
    private String deptAddress;//科室地址
    @Column(name = "adm_no")
    public String getAdmNo() {
        return admNo;
    }
    public void setAdmNo(String admNo) {
        this.admNo = admNo;
    }
    @Column(name = "guidance_id")
    public String getGuidanceId() {
        return guidanceId;

+ 22 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/base/processGuidance/BaseProcessGuidancePresetDO.java

@ -5,6 +5,7 @@ import com.yihu.jw.entity.UuidIdentityEntityWithCreateTime;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
 * 全流程指引预设流程
@ -20,6 +21,9 @@ public class BaseProcessGuidancePresetDO extends UuidIdentityEntityWithCreateTim
    private Integer sortNo;//步骤排序
    private Integer isOptional;//是否可选项(1必要项,2可选项 )
    private Integer status;//状态 0未做 1已做
    private Object obj;//已做的明细
    @Column(name = "process_guidance_id")
    public String getProcessGuidanceId() {
        return processGuidanceId;
@ -64,4 +68,22 @@ public class BaseProcessGuidancePresetDO extends UuidIdentityEntityWithCreateTim
    public void setIsOptional(Integer isOptional) {
        this.isOptional = isOptional;
    }
    @Transient
    public Integer getStatus() {
        return status;
    }
    public void setStatus(Integer status) {
        this.status = status;
    }
    @Transient
    public Object getObj() {
        return obj;
    }
    public void setObj(Object obj) {
        this.obj = obj;
    }
}

+ 67 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/base/processGuidance/BaseProcessGuidanceThirdPushLogDO.java

@ -0,0 +1,67 @@
package com.yihu.jw.entity.base.processGuidance;
import com.yihu.jw.entity.UuidIdentityEntityWithCreateTime;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * 全流程指引第三方推送日志
 * Created by yeshijie on 2022/11/29.
 */
@Entity
@Table(name = "base_process_guidance_third_push_log")
public class BaseProcessGuidanceThirdPushLogDO extends UuidIdentityEntityWithCreateTime {
    private String param;//推送的接口参数
    private String idcard;//身份证
    private String nodeCode;//节点code (不同流程的相同节点可能处理不一样)
    private String guidanceId;//流程Id
    private String api;//接口地址
    @Column(name = "param")
    public String getParam() {
        return param;
    }
    public void setParam(String param) {
        this.param = param;
    }
    @Column(name = "idcard")
    public String getIdcard() {
        return idcard;
    }
    public void setIdcard(String idcard) {
        this.idcard = idcard;
    }
    @Column(name = "node_code")
    public String getNodeCode() {
        return nodeCode;
    }
    public void setNodeCode(String nodeCode) {
        this.nodeCode = nodeCode;
    }
    @Column(name = "guidance_id")
    public String getGuidanceId() {
        return guidanceId;
    }
    public void setGuidanceId(String guidanceId) {
        this.guidanceId = guidanceId;
    }
    @Column(name = "api")
    public String getApi() {
        return api;
    }
    public void setApi(String api) {
        this.api = api;
    }
}

+ 4 - 2
svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/config/MvcConfig.java

@ -9,14 +9,16 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Profile;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
/**
 * Created by chenweida on 2017/4/6.
 */
@Configuration
public class MvcConfig extends WebMvcConfigurerAdapter {
@Profile({"mlwProd"})
public class MvcConfig extends WebMvcConfigurationSupport {
    private Logger logger = LoggerFactory.getLogger(MvcConfig.class);
    @Autowired

+ 17 - 4
svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/processGuidance/ProcessGuidanceEndpoint.java

@ -2,14 +2,12 @@ package com.yihu.jw.hospital.endpoint.processGuidance;
import com.yihu.jw.processGuidance.service.ProcessGuidanceService;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@ -24,6 +22,21 @@ public class ProcessGuidanceEndpoint extends EnvelopRestEndpoint {
    @Resource
    private ProcessGuidanceService processGuidanceService;
    @GetMapping(value = "findProcessGuidanceList")
    @ApiOperation(value = "获取居民进行中的流程")
    public Envelop findProcessGuidanceList(@ApiParam(name = "patient", value = "居民id", required = true)
                                @RequestParam(value = "patient") String patient,
                                @ApiParam(name = "isApp", value = "是否需要app,1是0否", required = true)
                                @RequestParam(value = "isApp") Integer isApp) {
        try {
            return ListEnvelop.getSuccess("查询成功",processGuidanceService.findProcessGuidanceList(patient,isApp));
        }catch (Exception e){
            e.printStackTrace();
        }
        return Envelop.getError("查询失败");
    }
    @PostMapping(value = "sendGuidance")
    @ApiOperation(value = "推送全流程指引")
    public Envelop sendGuidance(@ApiParam(name = "patient", value = "居民id", required = true)

+ 34 - 5
svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/processGuidance/ThirdProcessGuidanceEndpoint.java

@ -1,16 +1,18 @@
package com.yihu.jw.hospital.endpoint.processGuidance;
import com.yihu.jw.entity.base.processGuidance.BaseProcessGuidanceBookingDO;
import com.yihu.jw.entity.base.processGuidance.BaseProcessGuidanceThirdPushLogDO;
import com.yihu.jw.processGuidance.dao.BaseProcessGuidanceBookingDao;
import com.yihu.jw.processGuidance.dao.BaseProcessGuidanceThirdPushLogDao;
import com.yihu.jw.processGuidance.service.ProcessGuidanceService;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
/**
 * Created by yeshijie on 2022/11/23.
@ -22,17 +24,44 @@ public class ThirdProcessGuidanceEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private ProcessGuidanceService processGuidanceService;
    @Autowired
    private BaseProcessGuidanceBookingDao processGuidanceBookingDao;
    @Autowired
    private BaseProcessGuidanceThirdPushLogDao thirdPushLogDao;
    @PostMapping(value = "sendGuidanceInfo")
    @ApiOperation(value = "推送全流程指引")
    public Envelop sendGuidanceInfo(@ApiParam(name = "jsonData", value = "jsonData", required = true)
                                @RequestParam(value = "jsonData") String jsonData) {
        try {
//            processGuidanceService.sendGuidance(patient, type, orderId);
            processGuidanceService.sendGuidanceInfo(jsonData);
            return success("操作成功");
        }catch (Exception e){
            e.printStackTrace();
        }
        return Envelop.getError("保存失败");
    }
    @GetMapping(value = "getInfo")
    @ApiOperation(value = "获取测试数据")
    public Envelop getInfo(@ApiParam(name = "id", value = "id", required = true)
                           @RequestParam(value = "id") String id,
                           @ApiParam(name = "type", value = "type", required = true)
                           @RequestParam(value = "type") String type){
        try {
            if("thirdLog".equals(type)){
                BaseProcessGuidanceThirdPushLogDO logDO = thirdPushLogDao.findById(id).orElse(null);
                return ObjEnvelop.getSuccess("",logDO);
            }
            if("booking".equals(type)){
                BaseProcessGuidanceBookingDO logDO = processGuidanceBookingDao.findById(id).orElse(null);
                return ObjEnvelop.getSuccess("",logDO);
            }
        }catch (Exception e){
            e.printStackTrace();
        }
        return Envelop.getError("获取失败");
    }
}

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

@ -24,10 +24,6 @@ spring:
    time-between-eviction-runs-millis: 300000 #在空闲连接回收器线程运行期间休眠的时间值,以毫秒为单位,一般比minEvictableIdleTimeMillis小
  main:
    allow-bean-definition-overriding: true
  http:
    multipart:
      max-file-size: 30MB
      max-request-size: 100MB
#      location: D:/work/soft_dev/IdeaWorkSpace/wlyy2.0/svr/svr-patient/temp_file/
#      resolve-lazily: true