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/service/PrescriptionService.java

@@ -6603,20 +6603,20 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
     */
    public PageEnvelop findPatientAllPrescription(String keyName,String status,Integer page, Integer size) {
        String uid = userAgent.getUID();
        StringBuffer sql = new StringBuffer("SELECT b.*, c.oneself_pickup_flg FROM (SELECT a.* FROM wlyy_prescription a WHERE a.patient_code = '");
        StringBuffer sql = new StringBuffer("SELECT b.*, c.oneself_pickup_flg,f.job_title_code,f.job_title_name  FROM (SELECT a.* FROM wlyy_prescription a WHERE a.patient_code = '");
        StringBuffer countSql = new StringBuffer("select COUNT(b.id) count FROM (SELECT a.* FROM wlyy_prescription a WHERE a.patient_code = '");
        sql.append(uid).append("') b LEFT JOIN wlyy_prescription_info d ON b.id = d.prescription_id JOIN wlyy_prescription_expressage c ON c.outpatient_id = b.outpatient_id");
        countSql.append(uid).append("') b LEFT JOIN wlyy_prescription_info d ON b.id = d.prescription_id JOIN wlyy_prescription_expressage c ON c.outpatient_id = b.outpatient_id ");
        sql.append(uid).append("') b LEFT JOIN wlyy_prescription_info d ON b.id = d.prescription_id LEFT JOIN wlyy_prescription_expressage c ON c.outpatient_id = b.outpatient_id LEFT JOIN base_doctor f ON b.doctor=f.id ");
        countSql.append(uid).append("') b LEFT JOIN wlyy_prescription_info d ON b.id = d.prescription_id LEFT JOIN wlyy_prescription_expressage c ON c.outpatient_id = b.outpatient_id LEFT JOIN base_doctor f ON b.doctor=f.id  ");
        if (StringUtils.isNotEmpty(keyName)){
            sql.append(" AND (" +
            sql.append(" where (" +
                    " b.doctor_name LIKE '%"+keyName+"%' " +
                    " OR b.dept_name LIKE'%"+keyName+"%' " +
                    " OR b.hospital_name LIKE '%"+keyName+"%' " +
                    " OR d.drug_name LIKE '%"+keyName+"%' " +
                    " OR b.real_order LIKE '%"+keyName+"%' " +
                    ")");
            countSql.append(" AND (" +
            countSql.append(" where (" +
                    " b.doctor_name LIKE '%"+keyName+"%' " +
                    " OR b.dept_name LIKE'%"+keyName+"%' " +
                    " OR b.hospital_name LIKE '%"+keyName+"%' " +

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

@@ -381,6 +381,64 @@ public class WlyyPrescriptionVO extends UuidIdentityVOWithOperator {
    @ApiModelProperty(value = "取货方式", example = "模块1")
    private Integer oneselfPickupFlg;
    @ApiModelProperty(value = "药品总价，单位元", example = "模块1")
    private Double drugFee;
    @ApiModelProperty(value = "检查检验总价，单位元", example = "模块1")
    private Double inspectFee;
    @ApiModelProperty(value = "诊查费，单位元", example = "模块1")
    private Double regFee;
    @ApiModelProperty(value = "医生职称code", example = "模块1")
    private String jobTitleCode;
    @ApiModelProperty(value = "医生职称名称", example = "模块1")
    private String jobTitleName;
    public Double getDrugFee() {
        return drugFee;
    }
    public void setDrugFee(Double drugFee) {
        this.drugFee = drugFee;
    }
    public Double getInspectFee() {
        return inspectFee;
    }
    public void setInspectFee(Double inspectFee) {
        this.inspectFee = inspectFee;
    }
    public Double getRegFee() {
        return regFee;
    }
    public void setRegFee(Double regFee) {
        this.regFee = regFee;
    }
    public String getJobTitleCode() {
        return jobTitleCode;
    }
    public void setJobTitleCode(String jobTitleCode) {
        this.jobTitleCode = jobTitleCode;
    }
    public String getJobTitleName() {
        return jobTitleName;
    }
    public void setJobTitleName(String jobTitleName) {
        this.jobTitleName = jobTitleName;
    }
    public Integer getOneselfPickupFlg() {
        return oneselfPickupFlg;
    }