Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

Conflicts:
	patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/service/prescription/PrescriptionService.java

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/prescription/PrescriptionInfoController.java

@@ -124,8 +124,8 @@ public class PrescriptionInfoController extends BaseController{
    public String findDictByName(@ApiParam(name = "name", value = "药品名称（中文或拼音首字母查询）", defaultValue = "胰岛素")
                                 @RequestParam(value = "name", required = false) String name){
        try {
            return write(200, "操作成功！", "data",zyDictService.findDictByDoctorAndName("e3b3bfb3644011e69616fa163e424525",name));
//            return write(200, "操作成功！", "data",zyDictService.findDictByDoctorAnd(getUID(),name));
//            return write(200, "操作成功！", "data",zyDictService.findDictByDoctorAndName("e3b3bfb3644011e69616fa163e424525",name));
            return write(200, "操作成功！", "data",zyDictService.findDictByDoctorAndName(getUID(),name));
        } catch (Exception e) {
            error(e);
            return error(-1, "查询失败！");