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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/account/DoctorInfoService.java

@@ -391,6 +391,8 @@ public class DoctorInfoService extends BaseService {
            filters.put("hospital", new SearchFilter("hospital", Operator.LIKE, "%" + hospital.substring(0, 8) + "%"));
        }
        filters.put("level", new SearchFilter("level", SearchFilter.Operator.EQ, level));
        //只查询生效的医生
        filters.put("status", new SearchFilter("status", SearchFilter.Operator.EQ, 1));
        Specification<Doctor> spec = DynamicSpecifications.bySearchFilter(filters.values(), Doctor.class);

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/prenatalInspector/PrenatalController.java

@@ -28,7 +28,6 @@ public class PrenatalController extends BaseController{
    @ApiOperation("建卡列表-孕检计划")
    @RequestMapping(value = "prenatalInspectorList", method = RequestMethod.POST)
    @ObserverRequired
    public String prenatalInspectorList(@ApiParam(name = "patient", value = "居民code", defaultValue = "d9de442323324a759ac82857c4692184")
                                        @RequestParam(value = "patient", required = true) String patient){
        try {