Merge branch 'dev' of trick9191/wlyy2.0 into dev

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

@@ -31,6 +31,4 @@ public interface PrescriptionDao extends PagingAndSortingRepository<WlyyPrescrip
    WlyyPrescriptionDO findByRealOrder(String realOrder);
    List<WlyyPrescriptionDO> findByRealOrderList(String realOrder);
}

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

@@ -671,8 +671,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        } else if ("3".equals(status)) {
            //自取处方结束
            List<WlyyPrescriptionDO> wlyyPrescriptionDOs = prescriptionDao.findByRealOrderList(realOrder);
            WlyyPrescriptionDO wlyyPrescriptionDO = wlyyPrescriptionDOs.get(0);
            WlyyPrescriptionDO wlyyPrescriptionDO = prescriptionDao.findByRealOrder(realOrder);
            WlyyOutpatientDO outpatientDO = outpatientDao.findById(wlyyPrescriptionDO.getOutpatientId());
            if (null != wlyyPrescriptionDO && 1 == wlyyPrescriptionDO.getDispensaryType()) {

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

@@ -93,6 +93,11 @@ public class WlyyOutpatientDO extends UuidIdentityEntity {
	 */
	private String patientName;
    /**
     * 手机
     */
    private String mobile;
    /**
	 * 医生code
	 */
@@ -561,4 +566,12 @@ public class WlyyOutpatientDO extends UuidIdentityEntity {
    public void setEndTime(Date endTime) {
        this.endTime = endTime;
    }
    public String getMobile() {
        return mobile;
    }
    public void setMobile(String mobile) {
        this.mobile = mobile;
    }
}

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

@@ -101,6 +101,8 @@ public class WlyyOutpatientVO extends UuidIdentityVO {
	@ApiModelProperty(value = "居民名称", example = "模块1")
    private String patientName;
    @ApiModelProperty(value = "居民手机", example = "模块1")
    private String mobile;
    /**
	 * 医生code
	 */
@@ -443,4 +445,12 @@ public class WlyyOutpatientVO extends UuidIdentityVO {
    public void setOutpatientType(String outpatientType) {
        this.outpatientType = outpatientType;
    }
    public String getMobile() {
        return mobile;
    }
    public void setMobile(String mobile) {
        this.mobile = mobile;
    }
}