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/entrance/YkyyEntranceService.java

@@ -1603,7 +1603,7 @@ public class YkyyEntranceService {
        }
        if (StringUtils.isNoneBlank(pydm)){
            sql+=" and lower(yp.pydm) like '%"+pydm.toLowerCase()+"%' ";
            sql+=" and (lower(yp.pydm) like '%"+pydm.toLowerCase()+"%' or yp.ypmc like '%"+pydm+"%') ";
        }
        if (StringUtils.isNoneBlank(hisCode)){
            sql+=" and lower(yp.yfsb) like '%"+hisCode.toLowerCase()+"%' ";
@@ -2079,7 +2079,7 @@ public class YkyyEntranceService {
        String sql = "select i.code as \"code\",i.name as \"name\",i.disea_reason as \"disea_reason\",i.death_reason as \"death_reason\",i.py_code as \"py_code\",i.flag as \"flag\",i.add_code as \"add_code\",i.emr as \"emr\" from v_hlw_icd10 i";
        JSONArray array = new JSONArray();
        if (StringUtils.isNoneBlank(pyCode)){
            sql +="  where lower(i.py_code) like '%"+pyCode.toLowerCase()+"%'";
            sql +="  where 1=1 and (lower(i.py_code) like '%"+pyCode.toLowerCase()+"%' or i.name like '%"+pyCode+"%') ";
        }
        Map<String,Object> params = new HashedMap();
        params.put("sql",sql);

business/base-service/src/main/java/com/yihu/jw/utils/YkyySMSService.java

@@ -206,7 +206,7 @@ public class YkyySMSService {
            }else if ("oneself_pick".equalsIgnoreCase(temlateCode)){//病人自取
                smsTemplateDO = smsTemplateDao.findByClientId("oneself_pick");
                if (smsTemplateDO!=null){
                    content = smsTemplateDO.getContent().replace("{{病人姓名}}",wlyyOutpatientDO.getPatientName()).replace("{{处方号码}}",wlyyPrescriptionDO.getRealOrder())
                    content = smsTemplateDO.getContent().replace("{{病人姓名}}",wlyyOutpatientDO.getPatientName()).replace("{{时间}}",DateUtil.dateToStrLong(wlyyPrescriptionDO.getCreateTime())).replace("{{处方编码}}",wlyyPrescriptionDO.getRealOrder())
                    .replace("{{性别}}",sex);
                    if (wxPushLogDO==null&&"1".equalsIgnoreCase(sendMesControl)){
                        ykyySendSMS(mobile,smsTemplateDO.getHeader()+content);