Merge branch 'dev' of trick9191/patient-co-management into dev

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/entity/patient/prescription/Prescription.java

@@ -57,6 +57,8 @@ public class Prescription extends IdEntity {
    private String cancelReason;
    private String adjustReason;
    private String statusName; //
@@ -459,4 +461,12 @@ public class Prescription extends IdEntity {
    public void setCancelReason(String cancelReason) {
        this.cancelReason = cancelReason;
    }
    public String getAdjustReason() {
        return adjustReason;
    }
    public void setAdjustReason(String adjustReason) {
        this.adjustReason = adjustReason;
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/prescription/PrescriptionInfoService.java

@@ -644,7 +644,7 @@ public class PrescriptionInfoService extends BaseService {
        Doctor d = doctorDao.findByCode(doctor);
        if(d!=null&& StringUtils.isNotBlank(d.getHospital())){
            String h = d.getHospital().substring(0,8);
            String sql = "SELECT h.`code`,h.`name` FROM dm_hospital h WHERE h.`code` LIKE '%"+h+"%'";
            String sql = "SELECT h.`code`,h.`name` FROM dm_hospital h WHERE h.`code` LIKE '%"+h+"%' AND RIGHT(h.code,2)<>'00' ";
            List<Map<String,Object>> hs = jdbcTemplate.queryForList(sql);
            rs.put("hospitals",hs);
        }else{