Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

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

@@ -0,0 +1,11 @@
package com.yihu.jw.hospital.prescription.dao;
import com.yihu.jw.entity.hospital.prescription.WlyyOutpatientDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by Trick on 2019/6/3.
 */
public interface OutpatientDao extends PagingAndSortingRepository<WlyyOutpatientDO, String>, JpaSpecificationExecutor<WlyyOutpatientDO> {
}

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

@@ -16,16 +16,14 @@ import com.yihu.jw.entity.hospital.prescription.WlyyPrescriptionInfoDO;
import com.yihu.jw.hospital.consult.dao.DoctorClinicRoomConsultDao;
import com.yihu.jw.hospital.consult.dao.HospitalWaitingRoomDao;
import com.yihu.jw.hospital.mapping.dao.PatientMappingDao;
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.hospital.prescription.dao.*;
import com.yihu.jw.hospital.prescription.service.entrance.EntranceService;
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.*;
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;
@@ -81,6 +79,8 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
    private EntranceService entranceService;
    @Autowired
    private PatientMappingDao patientMappingDao;
    @Autowired
    private OutpatientDao outpatientDao;
    @Value("${demo.flag}")
    private boolean demoFlag;
@@ -130,6 +130,72 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        return null;
    }
    /**
     *
     * @param patient
     * @param status
     * @param page
     * @param size
     * @return
     */
    public MixEnvelop findReOutpatientList(String patient,Integer status,String startTime,String endTime,Integer page,Integer size){
        String totalSql = "SELECT " +
                " COUNT(1) AS total " +
                " FROM " +
                " wlyy_outpatient o " +
                " WHERE " +
                " o.patient = '"+patient+"'" +
                " o.status = "+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 " +
                " o.id, " +
                " o.adm_no AS admNo, " +
                " o.origin_adm_no AS originAdmNo, " +
                " o.register_no AS registerNo, " +
                " o.origin_register_no AS originRegisterNo, " +
                " o.dept AS dept, " +
                " o.dept_name AS deptName, " +
                " o.patient AS patient, " +
                " o.patient_name AS patientName, " +
                " o.doctor AS doctor, " +
                " o.doctor_name AS doctorName, " +
                " o.idcard AS idcard, " +
                " o.mjz AS mjz, " +
                " o.icd10 AS icd10, " +
                " o.icd10_name AS icd10Name, " +
                " o.adm_date AS admDate, " +
                " o.con_date AS conDate, " +
                " o.description AS description, " +
                " o.disease_img AS diseaseImg, " +
                " o.create_time AS createTime, " +
                " o.`status` AS `status`  " +
                " FROM " +
                " wlyy_outpatient o " +
                " WHERE " +
                " o.patient = '"+patient+"'" +
                " o.status = "+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'";
        }
        sql += " LIMIT " + (page - 1) * size + "," + size + "";
        List<WlyyOutpatientVO> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper(WlyyOutpatientVO.class));
        return MixEnvelop.getSuccessListWithPage(BaseHospitalRequestMapping.Prescription.api_success, list, page, size, count);
    }
    /**
     * 查询历史
     * @param patient

business/base-service/src/main/java/com/yihu/jw/org/dao/BaseOrgDao.java

@@ -45,4 +45,6 @@ public interface BaseOrgDao extends PagingAndSortingRepository<BaseOrgDO, String
    List<BaseOrgDO> findByCityCode(String cityCode);
    List<BaseOrgDO> findByDel(String del);
}

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

@@ -95,6 +95,20 @@ public class WlyyOutpatientDO extends UuidIdentityEntity {
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date admDate;
    /**
     * 复诊说明
     */
    private String description;
    /**
     * 病症图片，用“，”分割
     */
    private String diseaseImg;
    /**
     * 创建时间
     */
    private Date createTime;
    /**
	 * 就诊时间
	 */
@@ -243,6 +257,30 @@ public class WlyyOutpatientDO extends UuidIdentityEntity {
        this.status = status;
    }
    @Column(name = "description")
    public String getDescription() {
        return description;
    }
    public void setDescription(String description) {
        this.description = description;
    }
    @Column(name = "createTime")
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    @Column(name = "diseaseImg")
    public String getDiseaseImg() {
        return diseaseImg;
    }
    public void setDiseaseImg(String diseaseImg) {
        this.diseaseImg = diseaseImg;
    }
}

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

@@ -30,6 +30,16 @@ public class BaseHospitalRequestMapping {
         * 获取门诊记录
         */
        public static final String findOutpatientList = "/findOutpatientList";
        /**
         * 查询单条门诊记录接口
         */
        public static final String findOutpatientInfo ="/findOutpatientInfo";
        /**
         * 获取复诊记录类别
         */
        public static final String findReOutpatientList ="/findReOutpatientList";
        /**
         * 原处方记录
         */

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

@@ -121,6 +121,24 @@ public class WlyyOutpatientVO extends UuidIdentityVO {
	@ApiModelProperty(value = "就诊时间", example = "模块1")
    private Date conDate;
    /**
     * 复诊说明
     */
    @ApiModelProperty(value = "复诊说明", example = "模块1")
    private String description;
    /**
     * 病症图片，用“，”分割
     */
    @ApiModelProperty(value = "病症图片，用“，”分割", example = "模块1")
    private String diseaseImg;
    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间", example = "模块1")
    private Date createTime;
    /**
	 * -1 取消；0 候诊中 ；1 就诊中 ；2 已诊
	 */
@@ -247,5 +265,27 @@ public class WlyyOutpatientVO extends UuidIdentityVO {
        this.status = status;
    }
    public String getDescription() {
        return description;
    }
    public void setDescription(String description) {
        this.description = description;
    }
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    public String getDiseaseImg() {
        return diseaseImg;
    }
    public void setDiseaseImg(String diseaseImg) {
        this.diseaseImg = diseaseImg;
    }
}

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

@@ -23,6 +23,11 @@ import java.util.List;
@ApiModel(value = "WlyyPrescriptionVO", description = "在线处方主表")
public class WlyyPrescriptionVO extends UuidIdentityVOWithOperator {
    /**
     * 门诊记录说
     */
    @ApiModelProperty(value = "门诊记录说", example = "模块1")
    private String outpatientId;
    /**
     * HIS处方code（开方成功后返回）
     */
@@ -293,6 +298,13 @@ public class WlyyPrescriptionVO extends UuidIdentityVOWithOperator {
    @ApiModelProperty(value = "关联药品实体", example = "模块1")
    List<WlyyPrescriptionInfoVO> infoVOs;
    public String getOutpatientId() {
        return outpatientId;
    }
    public void setOutpatientId(String outpatientId) {
        this.outpatientId = outpatientId;
    }
    public String getRealOrder() {
        return realOrder;

svr/svr-internet-hospital-entrance/pom.xml

@@ -12,7 +12,7 @@
    <groupId>com.yihu.jw</groupId>
    <artifactId>svr-internet-hospital-entrance</artifactId>
    <packaging>war</packaging>
    <packaging>jar</packaging>
    <version>${parent.version}</version>
    <dependencies>
@@ -159,7 +159,7 @@
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
                <configuration>
                    <mainClass>com.yihu.SvrPatientApplication</mainClass>
                    <mainClass>com.yihu.SvrInternetHospitalEntranceApplication</mainClass>
                </configuration>
            </plugin>
            <plugin>

svr/svr-internet-hospital/pom.xml

@@ -12,7 +12,7 @@
    <groupId>com.yihu.jw</groupId>
    <artifactId>svr-internet-hospital</artifactId>
    <packaging>war</packaging>
    <packaging>jar</packaging>
    <version>${parent.version}</version>
    <dependencies>
@@ -211,7 +211,7 @@
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
                <configuration>
                    <mainClass>com.yihu.SvrPatientApplication</mainClass>
                    <mainClass>com.yihu.SvrInternetHospitalApplication</mainClass>
                </configuration>
            </plugin>
            <plugin>