Merge remote-tracking branch 'origin/dev' into dev

business/base-service/src/main/java/com/yihu/jw/hospital/consult/dao/DoctorClinicRoomConsultDao.java

@@ -0,0 +1,16 @@
package com.yihu.jw.hospital.consult.dao;
import com.yihu.jw.entity.hospital.consult.WlyyDoctorClinicRoomDO;
import com.yihu.jw.entity.hospital.prescription.WlyyPrescriptionDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
/**
 * Created by Trick on 2019/5/23.
 */
public interface DoctorClinicRoomConsultDao extends PagingAndSortingRepository<WlyyDoctorClinicRoomDO, String>, JpaSpecificationExecutor<WlyyDoctorClinicRoomDO> {
    List<WlyyDoctorClinicRoomDO> findByDoctorAndStatus(String doctor,Integer status);
}

business/base-service/src/main/java/com/yihu/jw/hospital/consult/dao/HospitalWaitingRoomDao.java

@@ -0,0 +1,11 @@
package com.yihu.jw.hospital.consult.dao;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalWaitingRoomDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by Trick on 2019/5/23.
 */
public interface HospitalWaitingRoomDao extends PagingAndSortingRepository<WlyyHospitalWaitingRoomDO, String>, JpaSpecificationExecutor<WlyyHospitalWaitingRoomDO> {
}

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

@@ -2,11 +2,16 @@ package com.yihu.jw.hospital.prescription.dao;
import com.yihu.jw.entity.hospital.prescription.WlyyPrescriptionDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
/**
 * Created by Trick on 2019/5/17.
 */
public interface PrescriptionDao extends PagingAndSortingRepository<WlyyPrescriptionDO, String>, JpaSpecificationExecutor<WlyyPrescriptionDO> {
    @Query("select a from WlyyPrescriptionDO a where a.patientCode = ?1 and a.status >= 0 ")
    List<WlyyPrescriptionDO> findByPatientCode(String patientCode);
}

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

@@ -4,8 +4,12 @@ import com.yihu.jw.entity.hospital.prescription.WlyyPrescriptionDiagnosisDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
/**
 * Created by Trick on 2019/5/17.
 */
public interface PrescriptionDiagnosisDao extends PagingAndSortingRepository<WlyyPrescriptionDiagnosisDO, String>, JpaSpecificationExecutor<WlyyPrescriptionDiagnosisDO> {
    List<WlyyPrescriptionDiagnosisDO> findByPrescriptionId(String prescriptionId);
}

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

@@ -4,8 +4,12 @@ import com.yihu.jw.entity.hospital.prescription.WlyyPrescriptionExpressageDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
/**
 * Created by Trick on 2019/5/17.
 */
public interface PrescriptionExpressageDao extends PagingAndSortingRepository<WlyyPrescriptionExpressageDO, String>, JpaSpecificationExecutor<WlyyPrescriptionExpressageDO> {
    List<WlyyPrescriptionExpressageDO> findByPrescriptionId(String prescriptionId);
}

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

@@ -1,7 +1,11 @@
package com.yihu.jw.hospital.prescription.dao;
import com.yihu.jw.entity.hospital.prescription.WlyyPrescriptionExpressageLogDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by Trick on 2019/5/17.
 */
public interface PrescriptionExpressageLogDao {
public interface PrescriptionExpressageLogDao extends PagingAndSortingRepository<WlyyPrescriptionExpressageLogDO, String>, JpaSpecificationExecutor<WlyyPrescriptionExpressageLogDO> {
}

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

@@ -1,11 +1,18 @@
package com.yihu.jw.hospital.prescription.dao;
import com.yihu.jw.entity.hospital.prescription.WlyyPrescriptionDO;
import com.yihu.jw.entity.hospital.prescription.WlyyPrescriptionInfoDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
/**
 * Created by Trick on 2019/5/17.
 */
public interface PrescriptionInfoDao extends PagingAndSortingRepository<WlyyPrescriptionInfoDO, String>, JpaSpecificationExecutor<WlyyPrescriptionInfoDO> {
    List<WlyyPrescriptionInfoDO> findByPrescriptionId(String prescriptionId);
}

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

@@ -1,7 +1,324 @@
package com.yihu.jw.hospital.prescription.service;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.dict.dao.DictHospitalDeptDao;
import com.yihu.jw.doctor.dao.BaseDoctorDao;
import com.yihu.jw.entity.base.dict.DictHospitalDeptDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.org.BaseOrgDO;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.base.patient.PatientMedicareCardDO;
import com.yihu.jw.entity.hospital.consult.WlyyDoctorClinicRoomDO;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalWaitingRoomDO;
import com.yihu.jw.entity.hospital.prescription.WlyyPrescriptionDO;
import com.yihu.jw.entity.hospital.prescription.WlyyPrescriptionDiagnosisDO;
import com.yihu.jw.entity.hospital.prescription.WlyyPrescriptionExpressageDO;
import com.yihu.jw.hospital.consult.dao.DoctorClinicRoomConsultDao;
import com.yihu.jw.hospital.consult.dao.HospitalWaitingRoomDao;
import com.yihu.jw.hospital.prescription.dao.PrescriptionDao;
import com.yihu.jw.hospital.prescription.dao.PrescriptionDiagnosisDao;
import com.yihu.jw.hospital.prescription.dao.PrescriptionExpressageDao;
import com.yihu.jw.hospital.prescription.dao.PrescriptionInfoDao;
import com.yihu.jw.org.dao.BaseOrgDao;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.patient.dao.BasePatientMedicareCardDao;
import com.yihu.jw.restmodel.hospital.prescription.WlyyPrescriptionDiagnosisVO;
import com.yihu.jw.restmodel.hospital.prescription.WlyyPrescriptionExpressageVO;
import com.yihu.jw.restmodel.hospital.prescription.WlyyPrescriptionVO;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.rm.base.BaseRequestMapping;
import com.yihu.jw.rm.hospital.BaseHospitalRequestMapping;
import com.yihu.jw.util.common.IdCardUtil;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import java.beans.PropertyDescriptor;
import java.lang.reflect.Method;
import java.util.*;
/**
 * Created by Trick on 2019/5/17.
 */
public class PrescriptionService {
@Service
public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, PrescriptionDao> {
    @Autowired
    private JdbcTemplate jdbcTemplate;
    @Autowired
    private BaseDoctorDao baseDoctorDao;
    @Autowired
    private BasePatientDao basePatientDao;
    @Autowired
    private BasePatientMedicareCardDao basePatientMedicareCardDao;
    @Autowired
    private PrescriptionDao prescriptionDao;
    @Autowired
    private PrescriptionDiagnosisDao prescriptionDiagnosisDao;
    @Autowired
    private PrescriptionExpressageDao prescriptionExpressageDao;
    @Autowired
    private PrescriptionInfoDao prescriptionInfoDao;
    @Autowired
    private DoctorClinicRoomConsultDao doctorClinicRoomConsultDao;
    @Autowired
    private HospitalWaitingRoomDao HospitalWaitingRoomDao;
    @Autowired
    private DictHospitalDeptDao dictHospitalDeptDao;
    @Autowired
    private BaseOrgDao baseOrgDao;
    public MixEnvelop findPrescriptionList(String patient, String status,String startTime, String endTime, Integer page, Integer size){
        String totalSql ="SELECT " +
                " count(1) AS total " +
                " FROM " +
                " wlyy_prescription p ";
        totalSql += " WHERE 1=1 ";
        if(StringUtils.isNotBlank(patient)){
            totalSql+=" AND p.patient ='"+patient+"'";
        }
        if(StringUtils.isNotBlank(status)){
            totalSql+=" AND p.status IN ("+status+")";
        }
        if(StringUtils.isNotBlank(startTime)){
            totalSql += " AND create_time >='"+startTime+" 00:00:00'";
        }
        if(StringUtils.isNotBlank(endTime)){
            totalSql += " AND create_time <='"+endTime+" 23:59:59'";
        }
        List<Map<String, Object>> rstotal = jdbcTemplate.queryForList(totalSql);
        Long count = 0L;
        if (rstotal != null && rstotal.size() > 0) {
            count = (Long) rstotal.get(0).get("total");
        }
        String sql ="SELECT " +
                " p.id, " +
                " p.saas_id AS saasId, " +
                " p.recipe_no AS recipeNo, " +
                " p.visit_no AS visitNo, " +
                " p.type AS type, " +
                " p.patient_code AS patientCode, " +
                " p.patient_name AS patientName, " +
                " p.ssc AS ssc, " +
                " p.doctor AS doctor, " +
                " p.doctor_name AS doctorName, " +
                " p.`status` AS `status`, " +
                " p.mk_fail_reason AS mkFailReason, " +
                " p.mk_time AS mk_time, " +
                " p.prescribe_reason AS prescribeReason, " +
                " p.prescribe_time AS prescribeTime, " +
                " p.pay_time AS payTime, " +
                " p.dosage_time AS dosageTime, " +
                " p.finish_time AS finishTime, " +
                " p.create_time AS createTime, " +
                " p.dept AS dept, " +
                " p.dept_name AS deptName, " +
                " p.hospital AS hospital, " +
                " p.hospital_name AS hospitalName, " +
                " p.consult AS consult, " +
                " p.dispensary_type AS dispensaryType, " +
                " p.reason AS reason, " +
                " p.remark AS remark, " +
                " p.cancel_reason AS cancelReason, " +
                " p.ca_cert_data AS caCertData, " +
                " p.ca_message AS caMessage, " +
                " p.digital_sign_no AS digitalSignNo, " +
                " p.original_data_abstract AS originalDataAbstract, " +
                " p.str_original_data AS strOriginalData, " +
                " p.his_dept_code AS hisDeptCode, " +
                " p.his_doctor_code AS hisDoctorCode, " +
                " p.his_gister_type_code AS hisGisterTypeCode, " +
                " p.his_rate_type_code AS hisRateTypeCode, " +
                " p.his_hospital AS hisHospital, " +
                " p.his_register_fee AS hisRegisterFee, " +
                " p.pay_status AS payStatus " +
                " FROM " +
                " wlyy_prescription p " +
                " WHERE 1=1 ";
        if(StringUtils.isNotBlank(patient)){
            sql+=" AND p.patient ='"+patient+"'";
        }
        if(StringUtils.isNotBlank(status)){
            sql+=" AND p.status IN ("+status+")";
        }
        if(StringUtils.isNotBlank(startTime)){
            sql += " AND create_time >='"+startTime+" 00:00:00'";
        }
        if(StringUtils.isNotBlank(endTime)){
            sql += " AND create_time <='"+endTime+" 23:59:59'";
        }
        sql += " LIMIT " + (page - 1) * size + "," + size + "";
        List<WlyyPrescriptionVO> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper(WlyyPrescriptionVO.class));
        //设置病种
        if(list!=null&&list.size()>0){
            for(WlyyPrescriptionVO vo:list){
                vo.setDiagnosisVOs(findDiagnosisById(vo.getId()));
            }
        }
        return MixEnvelop.getSuccessListWithPage(BaseHospitalRequestMapping.Prescription.api_success, list, page, size, count);
    }
    public List<WlyyPrescriptionDiagnosisVO> findDiagnosisById(String id){
        List<WlyyPrescriptionDiagnosisDO> list = prescriptionDiagnosisDao.findByPrescriptionId(id);
        List<WlyyPrescriptionDiagnosisVO> rs = new ArrayList<>();
        if(list!=null&&list.size()>0){
            return convertToModels(list,rs,WlyyPrescriptionDiagnosisVO.class);
        }
        return rs;
    }
    public Map<String,Object> findPrescriptionInfo(String prescriptionId){
        //续方信息
        Map<String,Object> rs = new HashedMap();
        WlyyPrescriptionDO wlyyPrescriptionDO = prescriptionDao.findOne(prescriptionId);
        rs.put("prescription",convertToModel(wlyyPrescriptionDO,WlyyPrescriptionVO.class));
        //居民详情
        BasePatientDO basePatientDO = basePatientDao.findById(wlyyPrescriptionDO.getPatientCode());
        rs.put("patientName",basePatientDO.getName());
        rs.put("patientId",basePatientDO.getId());
        rs.put("idCard",basePatientDO.getIdcard());
        rs.put("sex", basePatientDO.getSex());
        PatientMedicareCardDO cardDO = basePatientMedicareCardDao.findByTypeAndPatientCodeAndDel(PatientMedicareCardDO.Type.MedicareCard.getType(),wlyyPrescriptionDO.getPatientCode(),"1");
        rs.put("ssc",cardDO);
        rs.put("age",IdCardUtil.getAgeForIdcard(basePatientDO.getIdcard()));
        //物流信息
        List<WlyyPrescriptionExpressageDO> expressageDOs = prescriptionExpressageDao.findByPrescriptionId(wlyyPrescriptionDO.getId());
        if(expressageDOs!=null&&expressageDOs.size()>0){
            rs.put("expressage",convertToModel(expressageDOs.get(0), WlyyPrescriptionExpressageVO.class));
        }else{
            rs.put("expressage",null);
        }
        //诊断信息
        rs.put("diagnosis",findDiagnosisById(wlyyPrescriptionDO.getId()));
        //药品信息
        rs.put("infos",prescriptionInfoDao.findByPrescriptionId(wlyyPrescriptionDO.getId()));
        return rs;
    }
    public Boolean checkPrescription(String patient){
        List<WlyyPrescriptionDO> list = prescriptionDao.findByPatientCode(patient);
        if(list!=null&&list.size()>0){
            return false;
        }
        return true;
    }
    /**
     * 预约
     * @param json
     * @return
     */
    public Boolean appointmentRevisit(JSONObject json){
        //1.创建支付
        //2.支付回调
        paymentCallback(json);
        return true;
    }
    /**
     *
     * @param json
     * @return
     */
    public String paymentCallback(JSONObject json){
        //创建诊室
        createRoom(json);
        return null;
    }
    public Boolean createPrescription(JSONObject json){
        String patient = json.getString("patient");
        String doctor = json.getString("doctor");
        String dept = json.getString("dept");
        String hospital = json.getString("hospital");
        String reservationTime = json.getString("reservationTime");
        Integer consultType = json.getInteger("consultType");
        BasePatientDO basePatientDO = basePatientDao.findById(patient);
        PatientMedicareCardDO cardDO = basePatientMedicareCardDao.findByTypeAndPatientCodeAndDel(PatientMedicareCardDO.Type.MedicareCard.getType(),patient,"1");
        BaseDoctorDO baseDoctorDO = baseDoctorDao.findOne(doctor);
        WlyyPrescriptionDO prescription = new WlyyPrescriptionDO();
        prescription.setStatus(0);
        prescription.setPatientCode(patient);
        prescription.setPatientName(basePatientDO.getName());
        prescription.setSsc(cardDO.getCode());
        prescription.setDoctor(doctor);
        prescription.setDoctorName(baseDoctorDO.getName());
        return true;
    }
    public Boolean createRoom(JSONObject json){
        String patient = json.getString("patient");
        String doctor = json.getString("doctor");
        String dept = json.getString("dept");
        String hospital = json.getString("hospital");
        String reservationTime = json.getString("reservationTime");
        Integer consultType = json.getInteger("consultType");
        BasePatientDO basePatientDO = basePatientDao.findById(patient);
        BaseDoctorDO baseDoctorDO = baseDoctorDao.findOne(doctor);
        List<WlyyDoctorClinicRoomDO> list = doctorClinicRoomConsultDao.findByDoctorAndStatus(doctor,1);
        if(list!=null&&list.size()>0){
            //已经有诊室不做操作
        }else{
            //未有诊室则新增
            WlyyDoctorClinicRoomDO room = new WlyyDoctorClinicRoomDO();
            room.setDoctor(doctor);
            room.setDoctorName(baseDoctorDO.getName());
            room.setClinicName(baseDoctorDO.getName());
            DictHospitalDeptDO deptDO = dictHospitalDeptDao.findByCode(dept);
            room.setDept(dept);
            room.setDept(deptDO.getName());
            BaseOrgDO baseOrgDO = baseOrgDao.findByCode(hospital);
            room.setDept(hospital);
            room.setDept(baseOrgDO.getName());
            room.setClinicStatus(-1);
            room.setDate(new Date());
            room.setStatus(1);
            doctorClinicRoomConsultDao.save(room);
        }
        WlyyHospitalWaitingRoomDO waitingRoom = new WlyyHospitalWaitingRoomDO();
        waitingRoom.setConsultType(1);
        waitingRoom.setPatientId(patient);
        waitingRoom.setPatientName(basePatientDO.getName());
        waitingRoom.setReservationTime(DateUtil.strToDate(reservationTime));
        waitingRoom.setVisitStatus(0);
        waitingRoom.setReservationType(1);
        waitingRoom.setSort(0);
        waitingRoom.setConsultType(consultType);
        HospitalWaitingRoomDao.save(waitingRoom);
        return true;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/consult/WlyyDoctorClinicRoomDO.java

@@ -1,6 +1,7 @@
package com.yihu.jw.entity.hospital.consult;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -16,7 +17,7 @@ import java.util.Date;
*/
@Entity
@Table(name = "wlyy_doctor_clinic_room")
public class WlyyDoctorClinicRoomDO extends UuidIdentityEntityWithOperator {
public class WlyyDoctorClinicRoomDO extends UuidIdentityEntity {
    /**
	 * 

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/consult/WlyyHospitalWaitingRoomDO.java

@@ -1,6 +1,7 @@
package com.yihu.jw.entity.hospital.consult;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -16,7 +17,7 @@ import java.util.Date;
*/
@Entity
@Table(name = "wlyy_hospital_waiting_room")
public class WlyyHospitalWaitingRoomDO extends UuidIdentityEntityWithOperator {
public class WlyyHospitalWaitingRoomDO extends UuidIdentityEntity {
    /**
	 * 
@@ -62,7 +63,7 @@ public class WlyyHospitalWaitingRoomDO extends UuidIdentityEntityWithOperator {
    /**
	 * 咨询类型: 1图文 2视频 3图文+视频
	 */
	private Integer consultTpye;
	private Integer consultType;
	@Column(name = "saas_id")
@@ -129,12 +130,12 @@ public class WlyyHospitalWaitingRoomDO extends UuidIdentityEntityWithOperator {
        this.reservationType = reservationType;
    }
	@Column(name = "consult_tpye")
    public Integer getConsultTpye() {
        return consultTpye;
	@Column(name = "consult_type")
    public Integer getConsultType() {
        return consultType;
    }
    public void setConsultTpye(Integer consultTpye) {
        this.consultTpye = consultTpye;
    public void setConsultType(Integer consultType) {
        this.consultType = consultType;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/WlyyPrescriptionDO.java

@@ -1,6 +1,7 @@
package com.yihu.jw.entity.hospital.prescription;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -16,7 +17,7 @@ import java.util.Date;
*/
@Entity
@Table(name = "wlyy_prescription")
public class WlyyPrescriptionDO extends UuidIdentityEntityWithOperator {
public class WlyyPrescriptionDO extends UuidIdentityEntity {
    /**
	 * saas id
@@ -26,13 +27,13 @@ public class WlyyPrescriptionDO extends UuidIdentityEntityWithOperator {
    /**
	 * 失败原因
	 */
	private String failReason;
	private String mkFailReason;
    /**
	 * 失败时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date failTime;
	private Date mkTime;
    /**
	 * HIS处方code（开方成功后返回）
@@ -44,23 +45,12 @@ public class WlyyPrescriptionDO extends UuidIdentityEntityWithOperator {
	 */
	private String visitNo;
    /**
	 * 如果是续方 那就是处方的code
	 */
	private String parentId;
    /**
	 * 处方创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date createTime;
    /**
	 * 审核时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date reviewedTime;
    /**
	 * 开方成功时间
	 */
@@ -251,21 +241,6 @@ public class WlyyPrescriptionDO extends UuidIdentityEntityWithOperator {
        this.saasId = saasId;
    }
	@Column(name = "fail_reason")
    public String getFailReason() {
        return failReason;
    }
    public void setFailReason(String failReason) {
        this.failReason = failReason;
    }
	@Column(name = "fail_time")
    public Date getFailTime() {
        return failTime;
    }
    public void setFailTime(Date failTime) {
        this.failTime = failTime;
    }
	@Column(name = "recipe_no")
    public String getRecipeNo() {
@@ -283,13 +258,6 @@ public class WlyyPrescriptionDO extends UuidIdentityEntityWithOperator {
        this.visitNo = visitNo;
    }
	@Column(name = "parent_id")
    public String getParentId() {
        return parentId;
    }
    public void setParentId(String parentId) {
        this.parentId = parentId;
    }
	@Column(name = "create_time")
    public Date getCreateTime() {
@@ -299,14 +267,6 @@ public class WlyyPrescriptionDO extends UuidIdentityEntityWithOperator {
        this.createTime = createTime;
    }
	@Column(name = "reviewed_time")
    public Date getReviewedTime() {
        return reviewedTime;
    }
    public void setReviewedTime(Date reviewedTime) {
        this.reviewedTime = reviewedTime;
    }
	@Column(name = "prescribe_time")
    public Date getPrescribeTime() {
        return prescribeTime;
@@ -587,6 +547,21 @@ public class WlyyPrescriptionDO extends UuidIdentityEntityWithOperator {
        this.payStatus = payStatus;
    }
    @Column(name = "mk_time")
    public Date getMkTime() {
        return mkTime;
    }
    public void setMkTime(Date mkTime) {
        this.mkTime = mkTime;
    }
    @Column(name = "mk_fail_Reason")
    public String getMkFailReason() {
        return mkFailReason;
    }
    public void setMkFailReason(String mkFailReason) {
        this.mkFailReason = mkFailReason;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/WlyyPrescriptionDiagnosisDO.java

@@ -1,6 +1,7 @@
package com.yihu.jw.entity.hospital.prescription;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -16,7 +17,7 @@ import java.util.Date;
*/
@Entity
@Table(name = "wlyy_prescription_diagnosis")
public class WlyyPrescriptionDiagnosisDO extends UuidIdentityEntityWithOperator {
public class WlyyPrescriptionDiagnosisDO extends UuidIdentityEntity {
    /**
	 * 

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/WlyyPrescriptionExpressageDO.java

@@ -1,7 +1,8 @@
package com.yihu.jw.entity.hospital.prescription;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
@@ -16,7 +17,7 @@ import java.util.Date;
*/
@Entity
@Table(name = "wlyy_prescription_expressage")
public class WlyyPrescriptionExpressageDO extends UuidIdentityEntityWithOperator {
public class WlyyPrescriptionExpressageDO extends UuidIdentityEntity {
    /**
	 * 
@@ -134,119 +135,12 @@ public class WlyyPrescriptionExpressageDO extends UuidIdentityEntityWithOperator
	 */
	private String remark;
    /**
	 * 配送机构地址
	 */
	private String expressageHospitalAddress;
    /**
	 * 配送机构code
	 */
	private String expressageHospitalCode;
    /**
	 * 如果配送方式是健管师那么这个字段存服务站名称，如果是快递配送那么是快递公司名称
	 */
	private String expressageHospitalName;
    /**
	 * 配送人名称
	 */
	private String expressageName;
    /**
	 * 配送人code
	 */
	private String expressageCode;
    /**
	 * 开始配送时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date expressageTime;
    /**
	 * 配送人电话
	 */
	private String expressageMobile;
    /**
	 * 1可用 0删除
	 */
	private Integer del;
    /**
	 * 接收人电话
	 */
	private String acceptMobile;
    /**
	 * 接收人code
	 */
	private String acceptCode;
    /**
	 * 接收人名称
	 */
	private String acceptName;
    /**
	 * 接收人所属的机构code
	 */
	private String acceptHospital;
    /**
	 * 接收人所属机构名称
	 */
	private String acceptHospitalName;
    /**
	 * 接受时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date acceptTime;
    /**
	 * 患者填写的需要送达的机构地址
	 */
	private String patientHospitalAddress;
    /**
	 * 患者填写的需要送达的机构名称
	 */
	private String patientHospitalName;
    /**
	 * 患者填写的需要送达的机构code
	 */
	private String patientHospitalCode;
    /**
	 * 接收机构地址
	 */
	private String acceptHospitalAddress;
    /**
	 * 配药机构出药人（健管师或者称工作人员）
	 */
	private String hospitalDoctor;
    /**
	 * 配药机构出药人code
	 */
	private String hospitalDoctorCode;
    /**
	 * 配药机构出药时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date fetchingMedicineTime;
    /**
	 * 
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date deliveryTime;
	@Column(name = "saas_id")
@@ -433,182 +327,12 @@ public class WlyyPrescriptionExpressageDO extends UuidIdentityEntityWithOperator
        this.remark = remark;
    }
	@Column(name = "expressage_hospital_address")
    public String getExpressageHospitalAddress() {
        return expressageHospitalAddress;
    }
    public void setExpressageHospitalAddress(String expressageHospitalAddress) {
        this.expressageHospitalAddress = expressageHospitalAddress;
    }
	@Column(name = "expressage_hospital_code")
    public String getExpressageHospitalCode() {
        return expressageHospitalCode;
    }
    public void setExpressageHospitalCode(String expressageHospitalCode) {
        this.expressageHospitalCode = expressageHospitalCode;
    }
	@Column(name = "expressage_hospital_name")
    public String getExpressageHospitalName() {
        return expressageHospitalName;
    }
    public void setExpressageHospitalName(String expressageHospitalName) {
        this.expressageHospitalName = expressageHospitalName;
    }
	@Column(name = "expressage_name")
    public String getExpressageName() {
        return expressageName;
    }
    public void setExpressageName(String expressageName) {
        this.expressageName = expressageName;
    }
	@Column(name = "expressage_code")
    public String getExpressageCode() {
        return expressageCode;
    }
    public void setExpressageCode(String expressageCode) {
        this.expressageCode = expressageCode;
    }
	@Column(name = "expressage_time")
    public Date getExpressageTime() {
        return expressageTime;
    }
    public void setExpressageTime(Date expressageTime) {
        this.expressageTime = expressageTime;
    }
	@Column(name = "expressage_mobile")
    public String getExpressageMobile() {
        return expressageMobile;
    }
    public void setExpressageMobile(String expressageMobile) {
        this.expressageMobile = expressageMobile;
    }
	@Column(name = "del")
    @Column(name = "del")
    public Integer getDel() {
        return del;
    }
    public void setDel(Integer del) {
        this.del = del;
    }
	@Column(name = "accept_mobile")
    public String getAcceptMobile() {
        return acceptMobile;
    }
    public void setAcceptMobile(String acceptMobile) {
        this.acceptMobile = acceptMobile;
    }
	@Column(name = "accept_code")
    public String getAcceptCode() {
        return acceptCode;
    }
    public void setAcceptCode(String acceptCode) {
        this.acceptCode = acceptCode;
    }
	@Column(name = "accept_name")
    public String getAcceptName() {
        return acceptName;
    }
    public void setAcceptName(String acceptName) {
        this.acceptName = acceptName;
    }
	@Column(name = "accept_hospital")
    public String getAcceptHospital() {
        return acceptHospital;
    }
    public void setAcceptHospital(String acceptHospital) {
        this.acceptHospital = acceptHospital;
    }
	@Column(name = "accept_hospital_name")
    public String getAcceptHospitalName() {
        return acceptHospitalName;
    }
    public void setAcceptHospitalName(String acceptHospitalName) {
        this.acceptHospitalName = acceptHospitalName;
    }
	@Column(name = "accept_time")
    public Date getAcceptTime() {
        return acceptTime;
    }
    public void setAcceptTime(Date acceptTime) {
        this.acceptTime = acceptTime;
    }
	@Column(name = "patient_hospital_address")
    public String getPatientHospitalAddress() {
        return patientHospitalAddress;
    }
    public void setPatientHospitalAddress(String patientHospitalAddress) {
        this.patientHospitalAddress = patientHospitalAddress;
    }
	@Column(name = "patient_hospital_name")
    public String getPatientHospitalName() {
        return patientHospitalName;
    }
    public void setPatientHospitalName(String patientHospitalName) {
        this.patientHospitalName = patientHospitalName;
    }
	@Column(name = "patient_hospital_code")
    public String getPatientHospitalCode() {
        return patientHospitalCode;
    }
    public void setPatientHospitalCode(String patientHospitalCode) {
        this.patientHospitalCode = patientHospitalCode;
    }
	@Column(name = "accept_hospital_address")
    public String getAcceptHospitalAddress() {
        return acceptHospitalAddress;
    }
    public void setAcceptHospitalAddress(String acceptHospitalAddress) {
        this.acceptHospitalAddress = acceptHospitalAddress;
    }
	@Column(name = "hospital_doctor")
    public String getHospitalDoctor() {
        return hospitalDoctor;
    }
    public void setHospitalDoctor(String hospitalDoctor) {
        this.hospitalDoctor = hospitalDoctor;
    }
	@Column(name = "hospital_doctor_code")
    public String getHospitalDoctorCode() {
        return hospitalDoctorCode;
    }
    public void setHospitalDoctorCode(String hospitalDoctorCode) {
        this.hospitalDoctorCode = hospitalDoctorCode;
    }
	@Column(name = "fetching_medicine_time")
    public Date getFetchingMedicineTime() {
        return fetchingMedicineTime;
    }
    public void setFetchingMedicineTime(Date fetchingMedicineTime) {
        this.fetchingMedicineTime = fetchingMedicineTime;
    }
	@Column(name = "delivery_time")
    public Date getDeliveryTime() {
        return deliveryTime;
    }
    public void setDeliveryTime(Date deliveryTime) {
        this.deliveryTime = deliveryTime;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/WlyyPrescriptionExpressageLogDO.java

@@ -1,7 +1,8 @@
package com.yihu.jw.entity.hospital.prescription;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
@@ -16,7 +17,7 @@ import java.util.Date;
*/
@Entity
@Table(name = "wlyy_prescription_expressage_log")
public class WlyyPrescriptionExpressageLogDO extends UuidIdentityEntityWithOperator {
public class WlyyPrescriptionExpressageLogDO extends UuidIdentityEntity {
    /**
	 * 

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/WlyyPrescriptionInfoDO.java

@@ -1,6 +1,7 @@
package com.yihu.jw.entity.hospital.prescription;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
@@ -14,7 +15,7 @@ import javax.persistence.Table;
*/
@Entity
@Table(name = "wlyy_prescription_info")
public class WlyyPrescriptionInfoDO extends UuidIdentityEntityWithOperator {
public class WlyyPrescriptionInfoDO extends UuidIdentityEntity {
    /**
	 * 

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/WlyyPrescriptionLogDO.java

@@ -1,7 +1,8 @@
package com.yihu.jw.entity.hospital.prescription;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
@@ -16,7 +17,7 @@ import java.util.Date;
*/
@Entity
@Table(name = "wlyy_prescription_log")
public class WlyyPrescriptionLogDO extends UuidIdentityEntityWithOperator {
public class WlyyPrescriptionLogDO extends UuidIdentityEntity {
    /**
	 * 

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/WlyyPrescriptionReviewedDO.java

@@ -1,6 +1,7 @@
package com.yihu.jw.entity.hospital.prescription;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -16,7 +17,7 @@ import java.util.Date;
*/
@Entity
@Table(name = "wlyy_prescription_reviewed")
public class WlyyPrescriptionReviewedDO extends UuidIdentityEntityWithOperator {
public class WlyyPrescriptionReviewedDO extends UuidIdentityEntity {
    /**
	 * 

common/common-request-mapping/src/main/java/com/yihu/jw/rm/hospital/BaseHospitalRequestMapping.java

@@ -11,6 +11,7 @@ public class BaseHospitalRequestMapping {
     * 基础请求地址
     */
    private abstract static class Basic {
        public static final String api_success ="success";
        public static final String CREATE =  "/create";
        public static final String DELETE = "/delete";
        public static final String UPDATE = "/update";

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/prescription/WlyyPrescriptionVO.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import java.util.List;
/**
@@ -32,14 +33,14 @@ public class WlyyPrescriptionVO extends UuidIdentityVOWithOperator {
	 * 失败原因
	 */
	@ApiModelProperty(value = "失败原因", example = "模块1")
    private String failReason;
    private String mkFailReason;
    /**
	 * 失败时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "失败时间", example = "模块1")
    private Date failTime;
    private Date mkTime;
    /**
	 * HIS处方code（开方成功后返回）
@@ -53,11 +54,6 @@ public class WlyyPrescriptionVO extends UuidIdentityVOWithOperator {
	@ApiModelProperty(value = "HIS处方挂号号", example = "模块1")
    private String visitNo;
    /**
	 * 如果是续方 那就是处方的code
	 */
	@ApiModelProperty(value = "如果是续方 那就是处方的code", example = "模块1")
    private String parentId;
    /**
	 * 处方创建时间
@@ -66,13 +62,6 @@ public class WlyyPrescriptionVO extends UuidIdentityVOWithOperator {
	@ApiModelProperty(value = "处方创建时间", example = "模块1")
    private Date createTime;
    /**
	 * 审核时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "审核时间", example = "模块1")
    private Date reviewedTime;
    /**
	 * 开方成功时间
	 */
@@ -80,12 +69,6 @@ public class WlyyPrescriptionVO extends UuidIdentityVOWithOperator {
	@ApiModelProperty(value = "开方成功时间", example = "模块1")
    private Date prescribeTime;
    /**
	 * 配送到服务站的时候
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "配送到服务站的时候", example = "模块1")
    private Date expressageTime;
    /**
	 * 支付时间
@@ -289,6 +272,8 @@ public class WlyyPrescriptionVO extends UuidIdentityVOWithOperator {
	@ApiModelProperty(value = "处方结算状态，0为未结算，1为结算成功，默认为0", example = "模块1")
    private Integer payStatus;
    private List<WlyyPrescriptionDiagnosisVO> diagnosisVOs;
    public String getSaasId() {
        return saasId;
@@ -297,19 +282,6 @@ public class WlyyPrescriptionVO extends UuidIdentityVOWithOperator {
        this.saasId = saasId;
    }
    public String getFailReason() {
        return failReason;
    }
    public void setFailReason(String failReason) {
        this.failReason = failReason;
    }
    public Date getFailTime() {
        return failTime;
    }
    public void setFailTime(Date failTime) {
        this.failTime = failTime;
    }
    public String getRecipeNo() {
        return recipeNo;
@@ -325,12 +297,6 @@ public class WlyyPrescriptionVO extends UuidIdentityVOWithOperator {
        this.visitNo = visitNo;
    }
    public String getParentId() {
        return parentId;
    }
    public void setParentId(String parentId) {
        this.parentId = parentId;
    }
    public Date getCreateTime() {
        return createTime;
@@ -339,12 +305,6 @@ public class WlyyPrescriptionVO extends UuidIdentityVOWithOperator {
        this.createTime = createTime;
    }
    public Date getReviewedTime() {
        return reviewedTime;
    }
    public void setReviewedTime(Date reviewedTime) {
        this.reviewedTime = reviewedTime;
    }
    public Date getPrescribeTime() {
        return prescribeTime;
@@ -353,11 +313,21 @@ public class WlyyPrescriptionVO extends UuidIdentityVOWithOperator {
        this.prescribeTime = prescribeTime;
    }
    public Date getExpressageTime() {
        return expressageTime;
    public String getMkFailReason() {
        return mkFailReason;
    }
    public void setExpressageTime(Date expressageTime) {
        this.expressageTime = expressageTime;
    public void setMkFailReason(String mkFailReason) {
        this.mkFailReason = mkFailReason;
    }
    public Date getMkTime() {
        return mkTime;
    }
    public void setMkTime(Date mkTime) {
        this.mkTime = mkTime;
    }
    public Date getPayTime() {
@@ -591,5 +561,11 @@ public class WlyyPrescriptionVO extends UuidIdentityVOWithOperator {
        this.payStatus = payStatus;
    }
    public List<WlyyPrescriptionDiagnosisVO> getDiagnosisVOs() {
        return diagnosisVOs;
    }
    public void setDiagnosisVOs(List<WlyyPrescriptionDiagnosisVO> diagnosisVOs) {
        this.diagnosisVOs = diagnosisVOs;
    }
}

svr/svr-internet-hospital/pom.xml

@@ -59,10 +59,7 @@
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-config</artifactId>
        </dependency>
        <!--<dependency>-->
            <!--<groupId>org.springframework.cloud</groupId>-->
            <!--<artifactId>spring-cloud-starter-zipkin</artifactId>-->
        <!--</dependency>-->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-activemq</artifactId>
@@ -93,19 +90,12 @@
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-util</artifactId>
        </dependency>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>base-service</artifactId>
            <version>${parent.version}</version>
        </dependency>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-web</artifactId>
        </dependency>
        <!--<dependency>-->
            <!--<groupId>com.yihu.jw</groupId>-->
            <!--<artifactId>common-tracer</artifactId>-->
        <!--</dependency>-->
        <!-- 文件服务器 -->
        <dependency>
            <groupId>com.yihu</groupId>
@@ -190,16 +180,13 @@
            <artifactId>base-service</artifactId>
            <version>2.0.0</version>
        </dependency>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>sms-service</artifactId>
            <version>2.0.0</version>
            <scope>compile</scope>
        </dependency>
        <!--<dependency>-->
            <!--<groupId>junit</groupId>-->
            <!--<artifactId>junit</artifactId>-->
            <!--<groupId>com.yihu.jw</groupId>-->
            <!--<artifactId>sms-service</artifactId>-->
            <!--<version>2.0.0</version>-->
            <!--<scope>compile</scope>-->
        <!--</dependency>-->
        <dependency>
            <groupId>org.junit.platform</groupId>
            <artifactId>junit-platform-commons</artifactId>

svr/svr-internet-hospital/src/main/java/com/yihu/SvrInternetHospitalApplication.java

@@ -4,6 +4,7 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.support.SpringBootServletInitializer;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
/**

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

@@ -1,11 +1,22 @@
package com.yihu.jw.hospital.endpoint.prescription;
import com.yihu.jw.hospital.prescription.service.PrescriptionService;
import com.yihu.jw.restmodel.hospital.prescription.WlyyPrescriptionVO;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.hospital.BaseHospitalRequestMapping;
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.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.Map;
/**
 * Created by Trick on 2019/5/16.
 */
@@ -14,5 +25,44 @@ import org.springframework.web.bind.annotation.RestController;
@Api(value = "在线复诊", description = "在线复诊接口", tags = {"在线复诊接口"})
public class PrescriptionEndpoint extends EnvelopRestEndpoint {
    
    @Autowired
    private PrescriptionService prescriptionService;
    @GetMapping(value = BaseHospitalRequestMapping.Prescription.findPrescriptionList)
    @ApiOperation(value = "获取续方记录列表", notes = "获取续方记录列表")
    public MixEnvelop<WlyyPrescriptionVO,WlyyPrescriptionVO> findPrescriptionList(@ApiParam(name = "patient", value = "居民code")
                                                                                  @RequestParam(value = "patient", required = false) String patient,
                                                                                  @ApiParam(name = "status", value = "状态，多状态‘,’分割，例如‘1,2’，‘1,2,3’")
                                                                                  @RequestParam(value = "status", required = false)String status,
                                                                                  @ApiParam(name = "startTime", value = "开始时间，‘yyyy-MM-dd’")
                                                                                  @RequestParam(value = "startTime", required = false)String startTime,
                                                                                  @ApiParam(name = "endTime", value = "结束时间,yyyy-MM-dd’")
                                                                                  @RequestParam(value = "endTime", required = false)String endTime,
                                                                                  @RequestParam(value = "page", required = true) Integer page,
                                                                                  @ApiParam(name = "size", value = "每页大小")
                                                                                  @RequestParam(value = "size", required = true) Integer size) {
        return prescriptionService.findPrescriptionList(patient,status,startTime,endTime,page,size);
    }
    @GetMapping(value = BaseHospitalRequestMapping.Prescription.findPrescriptionInfo)
    @ApiOperation(value = "获取所有居民相关信息，续方信息，物流信息，药品信息（单条）", notes = "获取所有居民相关信息，续方信息，物流信息，药品信息（单条）")
    public ObjEnvelop<Map<String,Object>> findPrescriptionInfo(@ApiParam(name = "prescriptionId", value = "续方明细")
                                                               @RequestParam(value = "prescriptionId", required = false) String prescriptionId) {
        return success(BaseHospitalRequestMapping.Prescription.api_success,prescriptionService.findPrescriptionInfo(prescriptionId));
    }
    @GetMapping(value = BaseHospitalRequestMapping.Prescription.checkPrescription)
    @ApiOperation(value = "判断是否可续方,true 可以，false不可以", notes = "判断是否可续方,true 可以，false不可以")
    public ObjEnvelop<Boolean> checkPrescription(@ApiParam(name = "patient", value = "续方明细")
                                                               @RequestParam(value = "patient", required = false) String patient) {
        return success(BaseHospitalRequestMapping.Prescription.api_success,prescriptionService.checkPrescription(patient));
    }
    //===========
}